Page editing basics working
Fixes the page editing form
Merge branch 'master' of github.com:tide-framework/marina

Conflicts:
	Marina.package/monticello.meta/version