Lj
Merge branch 'master' of git@github.com:liaojia/LKOA4Android.git

Conflicts:
	res/layout-hdpi/module_detail_2_activity.xml