Fixed the content project having issues.
Resolved the content project merge conflict.
Merge branch 'master' of https://github.com/Bacon41/PantheonPrototype