Relying on sitemesh for decoration
Merge branch 'master' of https://github.com/searchbox/framework

Conflicts:
	log.roo