pull
Merge branch 'master' of https://github.com/noright/VideoNpix

Conflicts:
	AndroidManifest.xml
xiu gai tuichu fangshi