Merge pull request
Merge pull request
Merge branch 'develop' of git://github.com/agmip/agmip-common-functions into agmip-develop

Conflicts:
	src/main/java/org/agmip/functions/ExperimentHelper.java
	src/main/java/org/agmip/functions/SoilHelper.java
	src/test/java/org/agmip/functions/ExperimentHelperTest.java