change
n
Merge branch 'master' of https://github.com/gorgee/pearl2

Conflicts:
	src/Pearl2/DemoBundle/Controller/RoleController.php
	src/Pearl2/DemoBundle/Controller/TaskController.php
	src/Pearl2/DemoBundle/Controller/UserController.php
change
Merge branch 'master' of https://github.com/gorgee/pearl2

Conflicts:
	composer.lock