Kind integration added
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/UserBundle/Controller/userController.php