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

Conflicts:
	config/locales/de.yml
	config/locales/en-GB.yml
	config/locales/en.yml
	config/locales/fr.yml