Name-spacing bootstrap styles so they don't affect themes using bootstrap
Merge branch 'humbucker' of github.com:blueriver/MuraCMS into humbucker
Merge pull request #949 from stevewithington/humbucker

bug fix: plugin display object path issue
Working on multi-upload
Working on multi-upload
Working on multi-upload
Merge branch 'humbucker' of github.com:blueriver/MuraCMS into humbucker
Updating jcrop
Working on file metadata
Working on file metadata
Check for valid XML in themeConfig
Fixing traffic crop table display, streamlining table styles
Merge branch 'humbucker' of github.com:blueriver/MuraCMS into humbucker
Increase maximum dump limit to see full stacktrace
Merge branch 'humbucker' of https://github.com/blueriver/MuraCMS into humbucker
Remove external title and url from tcontentrelated
Remove externalURL and externalTitle
Removing bootstrap table classes from all tables. Using .less to nest bootstrap classes
Merge branch 'humbucker' of github.com:blueriver/MuraCMS into humbucker

Conflicts:
	admin/core/views/carch/form/dsp_tab_related_content.cfm
Working on file metadata