Merged player tab with prop tab.
Merge branch 'master' of https://github.com/monkstick/MunMod-2