Migrated from Django 1.5 => 1.6

Updated Grappelli and restored all functionality present in the previous commit