Minor schema changes
Merge branch '2.0dev' of github.com:prism/Prism into 2.0dev
Revert "Replace CraftBukkit dependency with Google Gson dependency"

This reverts commit 13d1120fc83234f61a6dd4b9a8152a9e07f57a92.