Remove git merge issue from CSS.
htmlR3s -> html
Fixing issues with tab drag/drop. [refs #3998 and spent 1 hour on #3998]
Getting rid of old code that allowed featured to be drag-added. The feature's been gone for awhile, but some of the code remained.
Getting rid of old code that allowed featured to be drag-added. The feature's been gone for awhile, but some of the code remained.
Cleanu
Merge branch 'master' into formbuilder

Conflicts:
	css_wordpress/app.css
	js/views/app.js
	js/views/tabs.js