Merge branch 'development' of git://github.com/jonutter/kuality-coeus into development
Merge branch 'development' of git://github.com/jonutter/kuality-coeus into development
Small readability improvement.
Added a .click where one was missing.
Updates to the users.yml, because of problems with grants.gov validations.
Merge branch 'development' of git://github.com/jonutter/kuality-coeus into development
Changed a method into a constant, as it makes more logical sense that way.
Changed a method into a constant, as it makes more logical sense that way. Some small stylistic changes, too.
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	lib/kuality-coeus/data_objects/proposal_development/s2s_questionnaire.rb
Some comment cleanup, adding a missing status update, and typo correction in a step def.
Moved methods into the superclass.
Fixed method placement, as they shouldn't be class methods in the superclass.
Data Obj Method for PHS Fellowship Questionnaire to be completed.