some bugs
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev

Conflicts:
	app/views/organizations/_form.html.erb
schema
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev