intermidiate comit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/config.c
added missing file from commit
Merge branch 'ddevrien-master'
More work on options window

dropdown function
Prefer the RCT2_GLOBAL macro
Added some more sprites and changed get_guest_face to use them
Increase the warning_throttle array size to hold all 7 values
Merge branch 'duncanspumpkin-master'
Merge branch 'master' of https://github.com/adrian17/OpenRCT2 into adrian17-master
Merge branch 'adrian17-master'
options window mouseup code
Merge branch 'options-window' of https://github.com/ddevrien/OpenRCT2 into ddevrien-options-window
fix warnings in options window
Merge branch 'ddevrien-options-window'
Merge branch 'options-window' of https://github.com/ddevrien/OpenRCT2 into ddevrien-options-window
Merge branch 'ddevrien-options-window'
Use macros defined in addresses.h where possible. Removed one doubled macro.
Merge branch 'adrian17-master'
implemented options window update method