BUG FIX: building_aqueduct (issue #164)
Merge pull request #166 from akuskis/master

Get changes from akuskis and dalerank
Merge branch 'master' of https://github.com/gecube/opencaesar3
Add change self salary window.