by zhanyi
by zhanyi
Merge remote-tracking branch 'origin/master'

Conflicts:
	_examples/completeDemo.html
	_src/adapter/fullscreen.js
	_src/plugins/dropfile.js
	dialogs/video/video.js
by zhanyi
by zhanyi
by zhanyi