修改
Merge branch 'master' of github.com:pandoraui/pandora
Merge branch 'master' of github.com:pandoraui/pandora

Conflicts:
	docs/assets/js/modules/pandora-dialog.js