Initial Unification Attempt

This is my first attempt to unify the PokemonTabletopUnitedFull branch
w/ the PokemonTabletopUnited branch.
Merge pull request #538 from cwstra/master

Initial Unification Attempt