Iteration 6 - Left side bar implemented
Iteration 6 - Left side bar implemented
Merge remote-tracking branch 'origin/iteration6' into iteration6

Conflicts:
	src/hotciv/common/userinterface/ChangeCityStateTool.java