Fixes to editor solution
Fix
Started Armor Editor
Merge