fixes
Merge branch 'master' of github.com:longfei-wang/mightyscreen

Conflicts:
	mightyscreen/urls.py
give up the upload