提交icon
Merge branch 'master' of github.com:zondaOf2012/AndroidPro4MySlideAppTemplate

Conflicts:
	web_hi_res_512.png