Fixing the bug that the previous push had introduced. Few fields started acting differently.
Part of the Jira:http://tintin.cs.indiana.edu:8091/browse/PSU-106
Merge branch 'master' of github.com:pandeynikita/UITS-Spring14