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

Conflicts:
	src/config.c
added missing file from commit
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 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
map window work + identified window var 4AC (selected tab idx)
map window paint method
Merge branch 'ddevrien-map-window'