Update naar versie 1.2.
Update naar versie 1.2.

Conflicts:
	html/000_Using GameMaker/000_Introduction.html
	html/000_Using GameMaker/003_GameMaker Studio Overview.html
	html/000_Using GameMaker/006_Sounds and music.html
	html/000_Using GameMaker/Events/index.html
	html/001_Advanced Use/010_Constants.html
	html/001_Advanced Use/Global game settings/Android Tab.html
	html/001_Advanced Use/More about sprites/Editing Sprites.html
	html/001_Advanced Use/More about sprites/Editing Subimages.html
	html/002_Reference/001_GML Language Overview/argument_count.html
	html/002_Reference/017_Obsolete Functions/index.html
	html/002_Reference/Debugging/get_integer.html
	html/002_Reference/Debugging/get_string.html
	html/002_Reference/Mouse, Keyboard and Other Controls/Device Input/device_get_tilt_x.html
	html/002_Reference/Mouse, Keyboard and Other Controls/Device Input/device_get_tilt_y.html
	html/002_Reference/Mouse, Keyboard and Other Controls/Device Input/device_get_tilt_z.html
	html/002_Reference/Mouse, Keyboard and Other Controls/GamePad Input/index.html
	html/002_Reference/Movement and Collisions/index.html
	html/002_Reference/Paths/path_orientation.html
	html/002_Reference/Physics/Forces/index.html
	html/002_Reference/Surfaces/surface_copy.html
Merge branch 'upstream' into onvertaald

Conflicts:
	html/000_Using GameMaker/000_Introduction.html
	html/000_Using GameMaker/003_GameMaker Studio Overview.html
	html/000_Using GameMaker/006_Sounds and music.html
	html/000_Using GameMaker/Events/index.html
	html/001_Advanced Use/010_Constants.html
	html/001_Advanced Use/Global game settings/Android Tab.html
	html/001_Advanced Use/More about sprites/Editing Sprites.html
	html/001_Advanced Use/More about sprites/Editing Subimages.html
	html/002_Reference/017_Obsolete Functions/index.html
	html/002_Reference/Debugging/get_integer.html
	html/002_Reference/Debugging/get_string.html
	html/002_Reference/Mouse, Keyboard and Other Controls/Device Input/device_get_tilt_x.html
	html/002_Reference/Mouse, Keyboard and Other Controls/Device Input/device_get_tilt_y.html
	html/002_Reference/Mouse, Keyboard and Other Controls/Device Input/device_get_tilt_z.html
	html/002_Reference/Mouse, Keyboard and Other Controls/GamePad Input/index.html
	html/002_Reference/Movement and Collisions/index.html
	html/002_Reference/Paths/path_orientation.html
	html/002_Reference/Physics/Forces/index.html
	html/002_Reference/Surfaces/surface_copy.html
Merge branch 'onvertaald'

Conflicts:
	html/001_Advanced Use/index.html
	html/002_Reference/index.html
	html/index.html