Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2

Conflicts:
	projects/openrct2.vcxproj.filters
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
Merge remote-tracking branch 'remotes/remote/ride-window'
window_scroll_to_location
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
#479
Merge pull request #477 from zsilencer/master

window_scroll_to_location