Merge branch 'develop-desk-tx' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop-desk-tx
