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

Conflicts:
	res/layout/activity_main.xml
	src/com/cssa/app/MainActivity.java