Merge branch 'legendary_master_wizard'

Conflicts:
.idea/workspace.xml