avance menu
on jonathan
Merge branch 'jonathan' into wilder

Conflicts:
	mockupvec/.architect
	mockupvec/app/view/MyViewport.js
	mockupvec/metadata/view/MyViewport
merge in jonathan -> wilder

merge