Merge branch 'develop' into slicing

Conflicts:
	src/Geekhub/UserBundle/Resources/views/User/user.html.twig
	src/Geekhub/UserBundle/Resources/views/User/userUpdateContacts.html.twig
Merge remote-tracking branch 'origin/slicing' into slicing
Merge remote-tracking branch 'origin/slicing' into slicing
Merge remote-tracking branch 'origin/slicing' into slicing

Conflicts:
	src/Geekhub/UserBundle/Resources/views/User/userUpdateContacts.html.twig
Merge remote-tracking branch 'origin/slicing' into slicing
fixed for tests