Merge branches 'develop' and 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop
