Use correct time for calculating impossible position hints
Removed water squares which really didn't make any sense
Merge branch 'master' of https://github.com/zrho/afp