config work
Merge branch 'master' of https://github.com/deschaefer/photomatcher

Conflicts:
	photomastercore/pom.xml

photomastercore/src/main/java/des/houseonthecreek/photomastercore/Config
uration.java