Fixed conlitc
Fixed conlitc
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Fix Add Link in navigation module
Fixed slugify in email templates module
Merge pull request #2259 from swilla/2.2/develop

Add Slugify to Templates module