Work in progress
Merge branch 'dev' of github.com:openforis/calc into dev
JSON Hibernate type converter
Service discovery and basic task working
Service discovery and basic task working