added placeholder for categories list
Make acquire_context always return some Context
fixing weird naming anomaly and bumping ver
Updated models.py for Django-CMS 2.2+

The location of CMSPlugin changed in 2.2 and has been updated accordingly.
Merge pull request #17 from PxlBuzzard/master

Updated models.py for Django-CMS 2.2+
Bump to version 0.4.1
Merge branch 'release/v0.4.1'
Merge branch 'release/v0.4.1' into develop
Use the latest version of bootstrap
Remove useless options
Use Pillow instead of PIL
Use flake8 instead of pep8 and pyflakes
Change the version to allow the buildout to run
Add evolution part
Use le last versions of the eggs
Correctly indent the buildout
Merge branch 'feature/update-buildout' into develop
Fix overrindentation
Use AbstractEntry instead of EntryAbstractClass
Merge branch 'feature/update-from-zinnia' into develop