Merge branch 'master' into dev
Switched coveralls image
updated advanced-usage.rst with instructions about configuring the CKEditor Advanced Content Filter
Merge branch 'master' into dev
'un-cherry-picked' changes to advanced usage that were only in dev
Merge branch 'master' into dev
Merge branch 'master' into dev
Upgraded django-mptt to 0.6.1
Added support for django 1.7
Added removed contrib middleware in MIDDLEWARE_CLASSES
Upgraded django compressor to 1.4
Removed python 2.6 and django 1.4 and 1.5
Removed south and updated easy-thumbnails requirements
Removed django_extenstions from INSTALLED_APPS setting
Added python 2.6 and django 1.4 and 1.5 support
Reset of accidental changed testproject_db
Exclude python 2.6 for django 1.7.1 in .travis.yml
Updated README.md
Prefer get_queryset over get_query_set
Added django 1.7 to tox config; also updated tested django versions