Made changes corresponding to the following JIRA requirements
http://tintin.cs.indiana.edu:8091/browse/PSU-88
http://tintin.cs.indiana.edu:8091/browse/PSU-98
http://tintin.cs.indiana.edu:8091/browse/PSU-99
Merge branch 'master' of https://github.com/pandeynikita/UITS-Spring14

Conflicts:
workflowbuilder/src/main/webapp/resources/static/controller/angularController.js