Proposed change to our .master files to make Copy/Paste of themes easier
Merge branch 'develop'
Merge branch 'feature-mp-masterfile-nocodefile'