django.simplejson -> json
Merge branch 'migrate-django1.6' of github.com:savoirfairelinux/adagios into migrate-django1.6