Vrijwilliger ProtocolHandler & State
Merge branch 'master' into Tanja

Conflicts:
	aid/src/com/eyecall/connection/Connection.java
	aid/src/com/eyecall/connection/ProtocolHandler.java
	aid/src/com/eyecall/connection/State.java
	aid/src/com/eyecall/volunteer/VolunteerProtocolHandler.java
	aid/src/com/eyecall/volunteer/VolunteerState.java
	vip/src/com/eyecall/connection/State.java
Merge branch 'Tanja'

Conflicts:
	aid/src/com/eyecall/connection/Connection.java
	aid/src/com/eyecall/connection/DefaultProtocolHandler.java
	aid/src/com/eyecall/connection/Message.java
	aid/src/com/eyecall/volunteer/VolunteerProtocolHandler.java
	aid/src/com/eyecall/volunteer/VolunteerState.java
nothing much added
Merge branch 'nick'
Merge remote-tracking branch 'origin/master' into Dennis