Made admin URLs Django 1.5 compatible

There were issues around ints, string and unicode. Certain views
expected unicode parameters, but others passed ids around as ints. Dict
keys should all be unicode as well
Fixing Django 1.5 admin, take two
Merge remote-tracking branch 'ionata/master'