Moved cnx demo into separate cnx directory

Also cleaned up the javascript config files
encoding is one of the valid ones the editor supports
Merge branch 'master' into ticket243
Merge pull request #7 from wysiwhat/ticket243

Do not display and edit MathML in math editor when Latex/Asciimath annotation is available.
Merge branch 'master' into oer-plugins-reorganisation
Merged from master
Merge pull request #8 from wysiwhat/oer-plugins-reorganisation

OER plugins reorganisation
Merge branch 'master' into cnx-config-cleanup
Merge pull request #9 from wysiwhat/cnx-config-cleanup

Cnx config cleanup
ticet254: math edit can edit mathml
Merge branch 'ticket254' into dev