Merge remote-tracking branch 'Ariadne-CMS/master'
Merge remote-tracking branch 'Ariadne-CMS/master'
Merge remote-tracking branch 'upstream/master'
Adding editorConfig file