Merge branch 'master' of https://github.com/Ernestyj/FamilyTouchDemo into Ernestyj-master

Conflicts:
	AndroidManifest.xml
	res/layout-1024x552/grid_item.xml
	res/layout-1024x552/layout_gridview.xml
	res/layout/aty_homepage.xml
	res/layout/layout_gridview.xml
	res/values/strings.xml
	src/com/familytouch/MainActivity.java
	src/com/familytouch/control/GridOnClickListener.java
	src/com/familytouch/data/Constant.java
	src/com/familytouch/ui/HomePage.java
	src/com/familytouch/view/GridViewPager.java