Version setzen
Merge branch 'master' of github.com:kivitendo/kivitendo-crm

Conflicts:
	inc/login.php