Merge pull request #4 from OpenSourceFieldlinguistics/master

Changes from upstream so you can work on the CAML paper...
pdf
Merge branch 'master' of github.com:hisakonog/FieldDB

Conflicts:
	docs/CAML/caml2012.pdf
Merge pull request #1329 from hisakonog/master

Merge pull request #4 from OpenSourceFieldlinguistics/master
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB

pulled from upstream
removing the caml pdf until we are done so to reduce merge conflicts on binary files
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB

Conflicts:
	docs/CAML/caml2012.pdf