Minor changes
Merge branch 'master' of github.com:opengeo/workshops

Conflicts:
	tutorials/wordmap/code/wordmap-full.js