implementation Oauth
Fix CS
Merge branch 'master' into OAuth

Conflicts:
	app/config/parameters.yml.dist
	composer.lock
	src/Tempo/Bundle/UserBundle/Entity/User.php
	src/Tempo/Bundle/UserBundle/Model/User.php
	src/Tempo/Bundle/UserBundle/Model/UserInterface.php
	src/Tempo/Bundle/UserBundle/Resources/config/doctrine/User.orm.xml