新增
Merge branch 'master' of https://github.com/2568295130/GIMI

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	AndroidManifest.xml
	res/layout/activity_main.xml
	res/layout/dingf.xml
	res/layout/list.xml
	res/layout/mainf.xml
	res/layout/mianshi.xml
	res/layout/scanner.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/gimi/adapter/FragmentViewPagerAdapter.java
	src/com/gimi/ui/JiuShuiActivity.java
	src/com/gimi/ui/MainFragment.java
	src/com/gimi/ui/MainUIActivity.java
	src/com/gimi/ui/MyApplication.java
	src/com/gimi/ui/SampleListFragment.java
	src/com/gimi/util/MyURL.java
	src/com/zxing/camera/CameraManager.java