Merge pull request #2 from starteam/master

Sex symbol improvements & edX integration disabled.