task-799
task-808
task-807
task-807
task-807
task-807
Merge task-808 into task-807

Conflicts:
	app/migration.sql
	src/SD/CommonBundle/Resources/views/AjaxForm/handlingUserForm.html.twig
	src/SD/UserBundle/Entity/User.php
	src/SD/UserBundle/Resources/config/doctrine/User.orm.yml
Merge staging into task-807

Conflicts:
	app/migration.sql
	src/SD/CommonBundle/Resources/views/AjaxForm/handlingUserForm.html.twig
	src/SD/UserBundle/Entity/User.php
	src/SD/UserBundle/Resources/config/doctrine/User.orm.yml
Merge staging into task-807

Conflicts:
	app/migration.sql
	src/SD/CommonBundle/Resources/views/AjaxForm/handlingUserForm.html.twig
	src/SD/UserBundle/Entity/User.php
	src/SD/UserBundle/Resources/config/doctrine/User.orm.yml
task-807
task-807
task-807
task-807
Merge branch 'staging' of github.com:itdoors/sd into staging

Conflicts:
	src/ITDoors/CommonBundle