Merge remote-tracking branch 'origin/master' into gdms_enablefunction

Conflicts:
	gdms/src/main/java/org/gdms/sql/function/FunctionManager.java
	gdms/src/test/java/org/gdms/sql/function/DistanceTest.java