commit plant
Merge branch 'master' of github.com:vVYou/OfflineBundle

Conflicts:
	Controller/OfflineController.php
	Resources/config/config.yml