Merge pull request #76 from yokose-ks/gacco2/master

EDX-316: Fix XSS vulnerability in inline discussion
EDX-282: Fix dashboard for resign and edit email