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

Conflicts:
	src/Pearl2/DemoBundle/Controller/DefaultController.php
user task
user Task
user task
Merge branch 'master' of https://github.com/gorgee/pearl2

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

Conflicts:
	src/Pearl2/DemoBundle/Resources/config/routing.yml