Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB

pulling the lates version from upstream after removing prototype and EMELD
Merge pull request #1340 from gretchenmcc/master

integrated yuliya's edits and reorganized sections to fit text better
more proofreading and added a better image for the json
renaming the paper to be about iField instead of lingsync
adding spanish abstract from emmy
Merge pull request #1341 from cesine/master

Renamign to ifield and more proofreading
Merge pull request #6 from OpenSourceFieldlinguistics/master

changes from upstream
Merge branch 'master' of github.com:hisakonog/FieldDB

marged changed from upstream
more proofreading, and making the langauge learning app image wider so we are down to 16pages
Merge pull request #1342 from cesine/master

more proofreading, and making the langauge learning app image wider so w...
putting it back to lingsync
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB
Merge pull request #7 from OpenSourceFieldlinguistics/master

More proofreading, now down to 16pages
Merge branch 'master' of github.com:hisakonog/FieldDB

pulling from upstream, name changed back to LingSync
:
added spreadsheet in plugin section, and grant number
Merge pull request #1343 from hisakonog/master

Spreadsheet in plugin
Typo correction, adding footnote about templates
another typo
Merge pull request #1344 from hisakonog/master

Typo correction
added grentee names