Updated guidelines to reflect changes discussed at the frontend meeting today
Merge branch 'feature-remove-jquery-noconflictsmode'