merge new ohmage-2.16 changes to the user_setup_password branch