Merge pull request #1428 from cesine/master

Small fixes for mcgill templates
Merge pull request #1442 from cesine/offline

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