DRYed a bunch of code in proposal development. Fixed associated methods in the step definitions.
Merge remote-tracking branch 'origin/development' into development