Merge pull request #765 from am11/master

Misc fixes
CSS: Drag-drop causing @import in web apps.(#486)
Code: Cleaned up commented code.