Merge pull request #3 from lu16j/master

req
Merge pull request #4 from lu16j/master

req
Merge pull request #5 from lu16j/master

req
Merge pull request #6 from lu16j/master

req
Merge pull request #7 from lu16j/master

req
working on json editor
Merge pull request #2 from michelleoj/master

req