Tomcat assembly recovered from sqlite branch
Merge branch 'master' into sqlite2

Conflicts:
	collect-core/pom.xml
	collect-core/src/main/java/org/openforis/collect/persistence/jooq/DialectAwareJooqFactory.java
Added README file in tomcat/data folder