bug when add attribute
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev

Conflicts:
	app/controllers/sessions_controller.rb