finalest merge ever
Merge branch 'manateeworks' of github.com:wipon/mobile-app into manateeworks