devise forms fix
Merge branch 'develop' of https://github.com/enforcers/LetMeDoIt into develop

Conflicts:
	app/models/bid.rb