[bugfix] imguploader
[bugfix] imguploader
Merge remote-tracking branch 'origin/master'

Conflicts:
	_src/adapter/buttons.js
[bugfix] imguploader
[bugfix] imguploader
[bugfix] imguploader
Merge remote-tracking branch 'origin/master'