updated files and apps to match Django 1.5