Lots of various changes
Merge branch 'master' of github.com:tutortrack/tutortrack-mobile