4 views could cross talk, and added upload function. Uploaded function will be stored in /media folder
Merge branch 'master' of https://github.com/longfei-wang/mightyscreen

Conflicts:
	main/include.py
	main/models.py