Merge branch 'master' of https://github.com/spaceapegames/panda-cms

Conflicts:
	panda-cms-model/src/main/scala/com/spaceape/panda/model/content/EntityTemplate.scala
	panda-cms-model/src/main/scala/com/spaceape/panda/model/content/GlobalSettings.scala
	panda-cms/src/main/scala/com/spaceape/cms/panda/resources/GameServiceResource.scala