Merge origin/master

Conflicts:
	src/main/java/org/nemac/geogaddi/config/PropertiesManager.java
	src/main/java/org/nemac/geogaddi/integrate/Integrator.java