s1. 002
07/24
Merge branch 'feature/phistpop' into develop

Conflicts:
	collection/ContentsCollection.js
	model/sequence/SequenceModel.js
	view/contents/ObjectView.js
	view/contents/TextView.js
	view/layout/TopToolBar.js
	view/layout/WorkSpace.js
	view/sequence/SequenceView.js