Update user-content.tpl

Replaced German text in English template.
Merge branch 'master' of https://github.com/Flowdeeps/Newscoop
Removing crlf endings
Merge branch 'new_plugins' of https://github.com/ahilles107/Newscoop
Merge packaging updates from the v4.1 branch
Fix getting language for uri.
Merge remote-tracking branch 'pawel/merge_v4_into_master'

Conflicts:
	composer.json
	newscoop/template_engine/classes/CampTemplate.php
Fix orm proxy generating on composer install.
change version, add info to changelog, fix upgrade error with wrong sample data in 4.0.1
Merge branch 'v4.1' of github.com:ahilles107/Newscoop into v4.1
remove informations about pr's from chnagelog
updated language resources
Merge branch 'v4.1' of https://github.com/ahilles107/Newscoop into v4.1
Janitorial fixes for packaging
Merge branch 'v4.1' of github.com:sourcefabric/Newscoop into merge_v4_into_master
Merge branch 'merge_v4_into_master' of github.com:ahilles107/Newscoop into merge_master_v4.1_with_new_plugins
rename CS-4605 upgrade sql script
updated language resources
fix critical CS-4632 - when publication alias is not in url
fix recursion on displaying error message - CS-4632