activity_main update
Merge branch 'master' of https://github.com/RuiqingQiu/CSSA

Conflicts:
	res/layout/activity_main.xml