添加部分图标，资源文件夹更名
Merge branch 'master' of https://github.com/Ernestyj/FamilyTouchDemo

Conflicts:
	src/com/familytouch/ui/HomePage.java