update
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/gxgj/video/pad/fragment/SampleListFragment.java
update