Fixed broken conditional that checked for a whole number requirement and then failed to validate a condition if the condition contained a whole number. The validation should only fail if the condition contains a value that is NOT a whole number.
Merge branch 'ohmage-2.16' of github.com:ohmage/server into ohmage-2.16-user_setup_password