Merge current work

What does this add?
* Buildings
* Technologies
* Player and City handlers

Fixes #2 and is work on #3 and #4.