Merge branch 'master' into update_objective
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.
Leftover debug call
Implement news_item_add_to_queue and some bugfixes.
Reset a accidental change to the project file during a merge.
Merge remote-tracking branch 'upstream/master' into update_objective
Merge branch 'jvlomax-jvlomax-settings'
update project file for settings merge