move reservoirs and aqueducts to different file, make buildings of aqueducts more real-like
add forgotten files
Merge remote-tracking branch 'upstream/master'