task
task user
Merge branch 'master' of https://github.com/gorgee/pearl2

Conflicts:
	src/Pearl2/DemoBundle/Entity/File.php
task
Merge branch 'master' of https://github.com/gorgee/pearl2

Conflicts:
	src/Pearl2/DemoBundle/Controller/TaskController.php
task