Pre-release for QA 2 (restored Version code)

This release contains an improved combined Entity and Entity_type screen, the new skip button, and restored Version code. We're still not creating Versions and I am unclear what exactly isn't happening that should. So either this release fixed an issue I don't understand how to vet, or it didn't and I'll need a clearer idea of what's missing.