ChrisLocalSettings
Merge branch 'develop' of http://github.com/briandant/mentor_up into develop
Bugfix in user_detail