Substitutions
Merge branch 'master' of github.com:F4R0N/kramkroae

Conflicts:
	includes/classes/user.class.php
Substitutions
Fixed error-handler and permissions
Merge branch 'master' of github.com:F4R0N/kramkroae
Startet Work on calendar
Merge branch 'master' of github.com:F4R0N/kramkroae