Merged local changes to mapper
Merge branch 'master' of https://github.com/EmilHernvall/tregmine
Merge branch 'master' of https://github.com/EmilHernvall/tregmine

Conflicts:
	util/zone_mapper/src/info/tregmine/zonemapper/FlatMapper.java
	util/zone_mapper/src/info/tregmine/zonemapper/Main.java
Fixed a few diffrent issues