Template edition working
Merge branch 'master' of github.com:tide-framework/marina

Conflicts:
	Marina.package/MRDirectory.class/methodProperties.json
	Marina.package/MRSetup.class/instance/createIndexPage.st
	Marina.package/MRSetup.class/methodProperties.json
	Marina.package/MRSetup.class/properties.json
	Marina.package/MRTemplate.class/methodProperties.json
	Marina.package/monticello.meta/version