Minor modifications
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	grails-app/views/layouts/main.gsp
logo update
Merge pull request #2 from yawenc/master

Some minor additions but site is down and I can't fake test stuff