_
Merge branch 'master' of https://github.com/rasom/site-builder

Conflicts:
	grails-app/controllers/sitebuilder/SiteController.groovy
	grails-app/domain/sitebuilder/widgets/NewsItem.groovy
_