Merge origin/master

Conflicts:
	gitdemo/src/gitdemo/Player.java