wtf
Merge branch 'master' of github.com:butze-mann/arma-ha

Conflicts:
	application/controllers/GroupController.php
datepicker angepasst
Merge branch 'master' of github.com:butze-mann/arma-ha
merge