http request
Merge branch 'master' of https://github.com/RuiqingQiu/CSSA.git

Conflicts:
	AndroidManifest.xml