Merge pull request #1343 from hisakonog/master

Spreadsheet in plugin
Merge pull request #1344 from hisakonog/master

Typo correction
Merge pull request #1345 from hisakonog/master

minor additions and change
Merge pull request #12 from OpenSourceFieldlinguistics/master

More proofreading
detailed copyediting in sections 1 & 2

also fixed a/b alignment in examples using tabular, although I can't
get vspace to make the example number go on the same line :(
Merge pull request #1346 from gretchenmcc/master

detailed copyediting in S 1&2
reordering spreadsheet to be first, adding more dtails and screenshots, reordering the users paragraph
Merge branch 'master' of github.com:gretchenmcc/FieldDB

Conflicts:
	docs/CAML/caml2012.tex
Merge pull request #13 from cesine/master

Some reordering in spreadsheet and summary
 the compact screenshot
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB
Merge branch 'master' of github.com:gretchenmcc/FieldDB
Merge pull request #1347 from gretchenmcc/master

adding compact image
some of my edits from section 3
finished edits in section 3

at least for now...
Merge pull request #1348 from gretchenmcc/master

edited section 3
putting technical info into one document
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB
final proofreading
Merge pull request #1349 from cesine/master

Another round of proofreading and put the tech specs in a formal document to help those who seek formal docs to find it...