Merge pull request #9 from liaojia/master

4寸调整
STH
Merge branch 'master' of git@github.com:suntinghui/LKOA4Android.git
STH
Merge pull request #10 from liaojia/master

ss
STH
Merge branch 'master' of git@github.com:suntinghui/LKOA4Android.git

Conflicts:
	res/layout-hdpi/main_activitygroup.xml
STH
dd
STH
Merge pull request #7 from suntinghui/master

ss