Merge branch 'release/v1.1' into develop
Only register the EntryAdminCKEditor if Entry model is based on AbstractEntry
Update the eggs
Use django-ckeditor instead of django-ckeditor-updated
Bumping to version 1.2
Merge branch 'release/v1.2'