fix #274. Add option PlayerCity::forceBuild when loading from savefile.
travis flags for build in 32bit mode
fixed conflict master merging