Nouveau exe Java
Merge branch 'master' of https://github.com/miiicmueller/SmartWater.git

Conflicts:
	App/Deploy/SmartWater.xml
	App/Deploy/launch4j.log