Merge branch 'develop'
Fixing PSR-0
Merge branch 'master' of https://github.com/aequasi/cache-bundle