travis update
Merge branch 'develop' into feature/registration_1