Merge remote-tracking branch 'upstream/master'
Identified peep.staff_type and days_in_month table.
Add game flag for development only below tree height.
Merge pull request #31 from kevinburke/game-flag

Add game flag for development only below tree height.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/rct2.h
	src/window_game_bottom_toolbar.c
Identified monthly ride income location.
fix peep structure
Merge branch 'master' of https://github.com/lnz/OpenRCT2 into lnz-master
reorganise addresses
Merge branch 'lnz-master'
set default screenshot format to PNG
Added happy peeps cheat. Labeled Bathroom peep offset.
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2