Merge pull request #1715 from cesine/master

Backbone release v2.29
Merge pull request #1716 from ProjetDeRechercheSurLecriture/master

Teacher Dashboard Iteration 12 - Cleaning up for demo
Merge pull request #1720 from cesine/master

Prototype release v2.30 and spreadsheet v2.30
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB
fixes #1721 updated map reduce to use both enteredByUser and user