typo correction and an addition of one new locale message
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB

merging from upstream
Merge pull request #1553 from cesine/master

Updates to install script for mac
Merge pull request #1572 from ProjetDeRechercheSurLecriture/master

Psycholinguistics Dashboard iteration 1

Deployed.
Merge pull request #1577 from ProjetDeRechercheSurLecriture/master

Psycholinguistics Dashboard iteration 2
Merge branch 'master' of github.com:hisakonog/FieldDB
Merge pull request #1587 from hisakonog/master

locales
fixes #1588
lesson_edit_handlebars with minimal data fields necessary for editing lesson contents
if thetemplate is for lesson, hide unnecessary datum fields like gloss, syntacticTree (this is done in css)
Merge pull request #1589 from cesine/master

fielddb-angular build added to the travis continous integration testing
Create LearningAppWhitePaper.tex
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB

pulled from upstream
Merge pull request #1591 from hisakonog/master

language lesson edit handlebars
Merge pull request #1592 from cesine/master

Psycholinguistics Dashboard iteration 3
Merge pull request #1596 from cesine/master

More Commonjs-ification
Merge pull request #1602 from cesine/master

Psycholinguistics Dashboard iteration 5 - Connect games with dashboard
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB
whitespace
changing datum edit view back to datum instead of the lesson template
moving the language learning template from the backbone app to the core
putting lesson handlebars in backbone app until it uses the core