Fixing GUI and translation issues (refs: #485
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev

Conflicts:
	app/views/project_areas/_form.html.erb
	app/views/users/_users.html.erb