Merge from tech_editor_improvements (Hardcore specific tech trees + layout fixes for all other tech trees)