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

Conflicts:
	dialogs/internal.js