halfway hacked
intermediate commit, merged with slightly older trunk
more changes missed
mask working and re-styled
Merge branch 'master' into bug-316

Conflicts:
	grails-app/views/home/index.gsp
review changes
Old JS file reference
Merge pull request #370 from aodn/bug-316

Bug 316