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

Conflicts:
	src/Pearl2/DemoBundle/Controller/JobController.php
pearl2 login
Merge branch 'master' of https://github.com/gorgee/pearl2

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