shindong 1
shindong 2
shindong 3
Merge remote-tracking branch 'origin/shindong' into sh

Conflicts:
	view/contents/ObjectView.js
	view/layout/TopToolBar.js