both arm types

mostly in.. mostly ugly
Merge remote-tracking branch 'origin/master'

Conflicts:
	barf1_2.gmx/barf1_2.project.gmx
	barf1_2_anja.gmx/barf1_2_anja.project.gmx
	barf1_2_anja.gmx/rooms/rm_game.room.gmx
Merge remote-tracking branch 'origin/master'

Conflicts:
	barf1_2.gmx/barf1_2.project.gmx
	barf1_2_anja.gmx/barf1_2_anja.project.gmx
	barf1_2_anja.gmx/rooms/rm_game.room.gmx