updates
updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/dk/faberespensen/kombot/ProxyServer.java
	src/main/java/dk/faberespensen/kombot/Runner.java
	src/notes.txt
	src/test/java/dk/faberespensen/kombot/ActionsIntegrationTest.java