Merge pull request #25 from lu16j/master

req
fiixed mode switching bug in jsoneditor
Merge pull request #10 from michelleoj/master

req