Upgrade to Django CMS 3.0 stable, Django 1.7, Python 3.3+ and Django Filer
Merge branch 'master' of https://github.com/mrsarm/django-mrdev-site

Conflicts:
	requirements.txt