sprach aenderungen
Merge branch 'master' of github.com:strimpa/etaf

Conflicts:
	models/lang/cat/account.php
	models/lang/cat/mail-templates/resend-activation.txt
	models/lang/de/account.php
	models/lang/de/welcome.php
	models/lang/en.php
	models/lang/en/account.php
	models/lang/en/welcome.php
	models/lang/es/account.php
	models/lang/es/welcome.php