Added arrow settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game Client/res/textures/arrow_0.png