refs #620
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev

Conflicts:
	app/views/projects/_projects.html.erb
refs #632
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev

Conflicts:
	app/views/projects/_projects.html.erb
refs #632
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev