Merge branch 'master' of http://218.59.175.43:3000/xwj/nsgk_android

 Conflicts:

	app/src/main/AndroidManifest.xml

	app/src/main/java/com/nsgk/ruralWeb/FullscreenActivity.java

	app/src/main/res/values/strings.xml