uidb36 --> uidb64 (Django 1.6)
Merge branch 'dev' of github.com:amcat/amcat into dev