Merged LMS discussion templates to discussion XBlock
Merged LMS discussion XModule scripts. Rebuilt minified file.
Fixed post-merge errors