update
Merge branch 'master' of https://github.com/SinaCloudStorage/SCS_Client

Conflicts:
	Views.py