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
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.
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
remove useless code - exception here is ok
Merge remote-tracking branch 'pawel/fix_CS-4605_upgrade_script' into v4.1
fix stats on cli
Update StatService.php

change null to empty string.
Merge remote-tracking branch 'pawel/CS-4633_newscoop-stats_error' into v4.1
Update upgrade.php

Add db_connect.php do upgrade.php - we need this when system_preferences.php file don't exists.
Merge remote-tracking branch 'pawel/patch-17' into v4.1
Merge branch 'v4.1' of git://github.com/sourcefabric/Newscoop into merge_4.1.1_into_master
Merge branch 'merge_4.1.1_into_master' of github.com:ahilles107/Newscoop into merge_master_v4.1_with_new_plugins