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

Conflicts:
	app/views/users/_dashboard_inner.html.erb

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