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