weird bug introduced
Players can both build in same City
Merge branch 'master' into 15_ClientInput

Conflicts:
	src/micropolisj/engine/CityBudget.java
	src/micropolisj/engine/Micropolis.java
	src/micropolisj/engine/ToolStroke.java
ResearchPoints require power

ResearchFundAlloc JPanel now shows right value