fighting with django
fully upgraded to django 1.5
Merge branch 'dev'