Fixed the modal issue
Fixed detailOption create modal
Added target self attribute/value to navbar
Fixed the dropdowns by adding pull-right class
Add side bar nav
Add nav
Merge branch 'develop-4' of https://github.com/ten24/Slatwall.git into feature-4-dropdownIssue
Css change to width
Removed global pull-right and added it in dropdownClass for two views
Added necessary attribute
Fixed the js causing the detailAccount page error
enabling the ability to add and filter attributes
Fixed editCountry
Added rbkey
creating the slatwall provider
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-collections
Merge pull request #2423 from ten24/feature-4-collections

Feature 4 collections
Merge remote-tracking branch 'origin/feature-4-sidenav' into develop-4

Conflicts:
	admin/layouts/default.cfm
Merge pull request #2419 from ten24/feature-4-addOptionFix

Added necessary attribute
Merge pull request #2420 from ten24/feature-4-detailAccountJSIssue

Fixed the js causing the detailAccount page error