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

Conflicts:
	src/config.c
added missing file from commit
Use macros defined in addresses.h where possible. Removed one doubled macro.
Merge branch 'adrian17-master'
implemented options window update method
Merge branch 'options-window' of https://github.com/ddevrien/OpenRCT2 into ddevrien-options-window
Merge branch 'ddevrien-options-window'
intermidiate commit
Merge branch 'gfx_draw_sprite' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-gfx_draw_sprite
Merge branch 'duncanspumpkin-gfx_draw_sprite' into gfx_unstable
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/addresses.h
	src/config.c
more configuration moved to new format. Started separating setings into
categories (general and sound so far)
removed unwanted spaces
Started work on map window
map window basic stuff done
Merge branch 'jvlomax-master'
improve config_parse_currency
map widgets + identified spinner widget
sprite id error