added new bugs
Merge branch 'master' of github.com:GeraldIstar/Civ-dio