added docs and renamed classes and packages
Merge branch 'master' of https://github.com/newohybat/civ