Reduced getCurrentPlayer() usage
Merge remote-tracking branch 'origin/master'

Conflicts:
	view-part1/GameView.c