text fixes
conflicts fixed and other small fixes

Conflicts:
	config/locales/en.yml
Merge branch 'master' of https://github.com/Hernemaissi/SummerJob