add widgets, sizing and basic events for new ride window
Merge branch 'master' into new-ride-window

Conflicts:
	src/window_new_ride.c
	src/window_research.c
add window_new_ride_populate_list
improve new ride window populate docs
fix window_new_ride_populate_list and add window_new_ride_scroll_to_focused_ride
implement scroll mouse events for new ride window
Merge pull request #343 from Balletie/master

Fix build on OSX by adding missing include (fixes #342)
add window_new_ride_paint_ride_information
clear up window_new_ride a bit
finish window_new_ride
Merge branch 'new-ride-window'

Conflicts:
	src/language.c
fix merge error
window_research_development_paint() crash fix

When the Currently in development Type: is "Ride" the game will crash,
looks like the wrong value is ANDed.
Merge pull request #345 from zsilencer/master

window_research_development_paint() crash fix
window_research_development_paint() ride names fix

stringId from typeId was not working right, this fixes it and gives
correct research ride names
Merge branch 'master' of https://github.com/zsilencer/OpenRCT2 into zsilencer-master

Conflicts:
	src/window_research.c
Merge branch 'zsilencer-master'
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
Added window_peep_close

Not tested. Cancels any tool that was in use by the window.
Started addition of window_peep_resize

Not tested.