...
Merge branch 'develop' of github.com:contester/scala-dispatcher into develop

Conflicts:
	src/main/scala/dispatcher/MoodleDispatcher.scala