7/8/14 -  Rewrote conditionals for input validation to use angular constants/values
Merge remote-tracking branch 'origin/master'