fixed modals
Merge branch 'master' into about_and_polishing

fixing merge conflicts