Conflicts:
	lib/kuality-coeus/data_objects/user.rb
Squashed commit of the following:

commit 34fd5d3d43fd3470ddc156f9fd37600bc09949b5
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu May 2 11:17:32 2013 -0700

    corrected scenario three in proposal_permissions feature file (adding approver)
Merge branch 'development' of github.com:aheward/kuality-coeus into development