更新断网
整合
加入权限
Merge branch 'master' of https://github.com/ShaoKi/360FloatWindow16

Conflicts:
	360FloatWindow/AndroidManifest.xml
	360FloatWindow/res/layout/float_window.xml
	360FloatWindow/src/com/example/floatwindow/FloatWindowMainView.java