loading_manager_++
Merge branch 'master' of github.com:vVYou/OfflineBundle

Conflicts:
	composer.lock