Added PEEP_NAUSEA_TOLERANCE enum
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
Merge pull request #62 from duncanspumpkin/master

Peep nausea tolerance enum
add guest list window
Adding item flags, time in thought struct
Reverting struct changes
Fixing typo
Add ride mode enum and name some ride variables
Labeled ride photo 1-4 and time in park offsets.
Fix bug: rides not sorted correctly
add grouping to guest list window
Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master
Merge branch 'MaciekBaron-master'
Merge branch 'ride_vars' of https://github.com/ZedThree/OpenRCT2 into ZedThree-ride_vars
Merge branch 'ZedThree-ride_vars'
Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-master
Merge branch 'duncanspumpkin-master'
fix peep structure