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

Conflicts:
	Controller/SynchronisationController.php
	Manager/TransferManager.php
	SyncConstant.php