fix failing tests; add new feature test
Merge branch 'master' of github.com:patbl/ea-skillshare

Conflicts:
	app/views/users/_user.html.haml
	spec/controllers/proposals_controller_spec.rb
	spec/features/updating_profile_spec.rb