fixed steam deleting, made mittari interact with water
Merge remote-tracking branch 'origin/master'