updated language on base settings
Installed django-filer
updated readme
added Zinnia support
Merge branch 'feature/djangocms'
added back in settings template
merge fix
Basic site wrapper complete