CONTENTBOX-399: Export/Import ContentBox Site as .cbox package
CONTENTBOX-399: Added JavaCast for override settings
CONTENTBOX-402; Upgrade File Input Styles
CONTENTBOX-402: Added plugin to simplify view syntax for including bootstrap-themed file inputs
CONTENTBOX-402: Fixed name of upload field in categories view
Merge pull request #114 from existdissolve/dev-importtools

CONTENTBOX-399
Export/Import ContentBox Site as .cbox package
Merge commit '50881713f9e18dc11e2fbf4628f6d11a79f09caa' into development

Conflicts:
	modules/contentbox-admin/layouts/admin.cfm
Merge pull request #115 from existdissolve/development

CONTENTBOX-402; #close
Upgrade File Input Styles
bad behavior on slugs when deactivated and no longer saved.
Merge branch 'development' of github.com:Ortus-Solutions/ContentBox into development
CONTENTBOX-400: Updated email templates to use common email layout, as well as Email Template Helper plugin for creating consistent email elements (+1 squashed commit)
Squashed commits:
[736c5d1] CONTENTBOX-400: Updated email templates to use common email layout, as well as Email Template Helper plugin for creating consistent email elements
CONTENTBOX-408 #close
Added better XSS escaping for search results
Merge pull request #117 from existdissolve/dev-email-templates

CONTENTBOX-400: Updated email templates
Update EmailTemplateHelper.cfc

Added persistence to plugin.
little updates to updater
CONTENTBOX-399
CONTENTBOX-399
slugs and some formatting.
added missing licenses
syntax
finalized coldbox upgrade to v3.8