11.04.14 add new funktions
ad
Merge remote-tracking branch 'origin/master'

Conflicts:
	dicewars/src/main/scala/dicewars.scala