Update README.markdown
Updated json gem
Merge branch 'devel' of github.com:linguisticexplorer/Linguistic-Explorer into devel
Updated README with more statuses
Fixed conflict