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

Conflicts:
	.cproject