relayout
merge
fake
Merge branch 'jonathan' into wilder

Conflicts:
	mockupvec/.architect
	mockupvec/app/view/MyViewport.js
	mockupvec/metadata/view/MyViewport
Merge branch 'jonathan' into wilder
jonathan
fix integration