Merge branch 'master' into update_objective
Name peep variables for current train and car
Fix finding peep on ride news items

Peep's current_* variables were offset by 1. Also fixed comparison
between 32-bit and 16-bit ints.
Change peep news item enum names
Add rct_car sprite and tidy up news locator

Also add (x,y,z) coordinate variables for rct_peep
Fix comments
fix case and add author to source code header
rename current day to current month ticks
Merge remote-tracking branch 'upstream/master' into update_objective

Conflicts:
	src/window_game_bottom_toolbar.c
Start implementation of scenario_update.
Make scenario update timeframes clearer
Merge branch 'master' into update_objective

Conflicts:
	src/window_game_bottom_toolbar.c
Implement simple objective checks
Implement scenario success and failure procedures.
Added check for 10 rollercoaster objective
Implement "Finish 5 rollercoaster..:" objective check and some fixups
Implement entrance fee too high check. Some refactoring.
Merge remote-tracking branch 'upstream/master' into update_objective
Implement marketing campaign updating.
Rename marketing_finished to marketing_update.