whole number fix for HT
Merge branch 'ohmage-2.16' of github.com:ohmage/server into ohmage-2.16-user_setup_password