Fixed conlitc
Fixed conlitc
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
nav section title in button. button red and angry.
Merge pull request #2250 from james2doyle/feature/new-nav-remove-btn

nav section title in delete button. button red and angry.
Profile id is not always the same as user_id

This fixes a bug with unique fields not validating correctly when the profile id and the user id go out of sync.
Fixing issue where unique validation fails if profile id != user id
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
Updated blog_category_form to support modal box slugify
Merge pull request #2256 from chrisnharvey/patch-1

Profile id is not always the same as user_id
Merge pull request #2260 from swilla/2.2/develop

Updated blog_category_form to support modal box slugify
Merge remote-tracking branch 'upstream/2.2/develop' into projects/cardworld/develop