Merge branch '1.1.0' of https://github.com/arnecls/raidplaner into arnecls-1.1.0

Conflicts:
	lib/private/locale/cs.php