update site version
Merge branch 'master' of github.com:grails-samples/grails-website

Conflicts:
	application.properties
fixed broken twitterApi configuration