-浮动窗口模块。
Merge remote-tracking branch 'origin/master'

Conflicts:
	appProject/.idea/encodings.xml
	appProject/.idea/workspace.xml
--what
Merge remote-tracking branch 'origin/master'

Conflicts:
	appProject/.idea/workspace.xml