Import json instead of django.simplejson
Fixes JSON import bug, bumps version number.
Merge branch 'master' of https://github.com/GoodCloud/django-ajax-uploader

Conflicts:
	ajaxuploader/views/base.py
	setup.py
Updated version to 0.3.1.1