Minor changes to make sure db testing migrations works fine with newest changes.
Minor changes to support different color Pokemon spawning for different players.
Merge pull request #41 from Codes-With-Eagles-SWE2014/jrlmwc_sprint4

Jrlmwc sprint4