架构——客户端
Merge branch 'master' of github.com:ResonanceByNJU/Resonance

Conflicts:
	.classpath
	.project
	AndroidManifest.xml
	bin/AndroidManifest.xml
	libs/android-support-v4.jar
	project.properties
	res/layout/activity_main.xml
	res/values/strings.xml