Task and tasktype
Task
Merge branch 'master' of https://github.com/fiithesismgr/AcaTisM

Conflicts:
	src/Acatism/MainBundle/Controller/DefaultController.php