sepearte estates into 4-types: basic/res/defensive/offensive
Merge branch 'develop' of https://github.com/xtaci/gonet into develop