Merge pull request #36 from IlchCMS/master

merge kevin
adding user frontend
Merge branch 'kveldscholten' of github.com:IlchCMS/Ilch-2.0 into kveldscholten

Conflicts:
	application/modules/user/config/config.php
update user frontend
Merge remote-tracking branch 'origin' into kveldscholten

Conflicts:
	application/modules/install/install/install_private.sql
	application/modules/user/mappers/User.php
	application/modules/user/translations/de.php
	application/modules/user/translations/en.php
install fix
Merge pull request #38 from IlchCMS/kveldscholten

adding user frontend
fix merge (phpunit error)
Merge branch 'master' of github.com:IlchCMS/Ilch-2.0 into corian