Merge pull request #1 from yawenc/master

Trying to add Gumby framework
update code with yawen's PR
Minor modifications
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	grails-app/views/layouts/main.gsp