merged conflicts
merge (work in progress)
Added base JPA entity
Merge branch 'dev' of https://github.com/openforis/calc into dev

Conflicts:
	calc-core/src/main/java/org/openforis/calc/chain/pre/AssignAoisTask.java
	calc-core/src/main/java/org/openforis/calc/engine/PrepareOutputSchemaTask.java
	calc-core/src/main/java/org/openforis/calc/engine/Task.java
	calc-core/src/main/java/org/openforis/calc/metadata/AoiHierarchyLevel.java
Changed location of preprocess tasks
Added preprocess tasks
merge with head
merge with head
merge with head