ack water request
Merge branch 'master' of https://github.com/DanXMuc/BalconyGardener

Conflicts:
	Server/actions.php
execute ack water