MRSetup will help you configure the web server now
Fix generation of atom.xml
Fix searching for structure in MRPagesHandler
Merge branch 'master' of github.com:tide-framework/marina

Conflicts:
	Marina.package/MRAtomBlogExporter.class/methodProperties.json
	Marina.package/MRBlog.class/methodProperties.json
	Marina.package/MRPagesHandler.class/methodProperties.json
	Marina.package/MRStructure.class/methodProperties.json
	Marina.package/monticello.meta/version