Fixed null pointer bug in Road and Town
Merge branch 'master' of https://github.com/255/catan