Fixed conlitc
Fixed conlitc
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Fix for issue #2240 - pages with no fields can now be edited and saved
Add recursive function to allow has_current navigation links to be found in any level of navigation
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
Fixing default value issue in choice field type.

There is no way that nobody ever used this before, but the logic for this was literally just not in there. I'm not sure if it got removed or something else happened, but there you go. This only affected drop downs.
Merge branch '2.2/develop' of git://github.com/bloveless/pyrocms into 2.2/develop
Merge pull request #2247 from jaminday/2.2/issue_2240

Pages with no fields can now be edited and saved
Fixing padding for permissions table.
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Fixing gray cancel button on delete page type page.