Major code edits
Merge remote-tracking branch 'origin/master'

Conflicts:
	Placeholder/Content/LevelSelect.Level.data
	Placeholder/Content/LevelTable.ResourceTable.data
	Placeholder/Content/Placeholder.library