changed types from long to integer and fixed combiner
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/java/org/ist/app/BirdAppCombiner.java
	src/main/java/org/ist/app/DBConnector.java
changed types from long to integer and fixed combiner