syncontrol
Merge branch 'master' of https://github.com/vVYou/OfflineBundle

Conflicts:
	Controller/SynchronisationController.php