gjjg
Merge branch 'master' of github.com:butze-mann/myosotis

Conflicts:
	application/controllers/GruppenController.php
	application/models/DbTable/TaskTable.php
	application/views/helpers/ShowTasks.php