Move to camel case functions
Merge branch 'master' of github.com:opengeo/workshops

Conflicts:
	workshops/postgis/source/en/linear_referencing.rst