layout updated
Merge branch 'master' of github.com:RuiqingQiu/CSSA

Conflicts:
	src/com/cssa/app/MainActivity.java