update to Django 1.6 and added django-wiki
update to django 1.6 and django-wiki
Merge branch 'campaign' of github.com:mci/mpatlas
stable interface with django 1.6 and wiki
using old splash screen for now