fix CRLF
Merge branch 'dev' of github.com:butschster/kodicms into dev

Conflicts:
	cms/application/bootstrap.php