Added fix for Django 1.5 and simplejson compatibility in json_encode. See https://github.com/simplejson/simplejson/issues/37 for more details
Merge branch 'master' of github.com:ilblackdragon/django-misc

Conflicts:
	misc/json_encode.py