Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Game.cpp
