new main page now default
Merge branch 'master' of github-Cloudbase:cloudbasesexy/projectmomma

Conflicts:
	features/_testbox.haml