updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/dk/faberespensen/kombot/ConquerWilds.java
	src/main/java/dk/faberespensen/kombot/Runner.java
	src/main/webapp/WEB-INF/views/compactcities.jsp