Change project state name  refs #629
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev

Conflicts:
	app/views/projects/_form.html.erb