Merge branch 'refs/heads/patch-0'

Conflicts:
	README.md
	ajaxuploader/views/base.py
Merge branch 'refs/heads/patch-1'