Add dependency to Voyage-Memory for running tests
Refactor templates and use Voyage-Memory for tests
Merge branch 'master' of github.com:tide-framework/marina

Conflicts:
	Marina.package/monticello.meta/version