shin dong commit
Merge branch 'develop' of https://github.com/phistpop2/cloud-PTs--D into develop

Conflicts:
	app.js
	view/contents/ObjectView.js