Merge pull request #1 from OpenSourceFieldlinguistics/master

Bringing in changes
for #882 i added a button
Merge branch 'master' of github.com:Yogurt1206/FieldDB
fixes #883 i made a new manifest and deployment script for the miami project
for #895 i changed the defalt layout so that I have the only datum entry
for #887 I made datum_edit_myaamia_embedded.handlebars and myaamiaDatumEditView default for my users
for #895 i made default number of datum as 1
fixes #895 I changed user preference for myaamia
fixes #895 I changed the css  for myaamia
fixes #896 I added hide and show button
fixes #887 I made datum_edit_myaamia_embedded.handlebars
fixes #895 I changed the edition number of miami app
Added ambiguous tree in Quechua

Fixes #927
Merge pull request #1 from cesine/master

We need a field for the trees
for #929 added function to guess QTrees for a morphemes line
Merge pull request #5 from cesine/master

A UI for uploading for you to test entire flow with
Minor changes to server.js to pre-include MD5-hashes in JSON. Also now adding all of the related .jade templates.
Changed mixin for rendering a user's corpora list to properly show the title and description. Modified server.js so that the getcorpus function always returns values, and changed the user and corpus routes to both call the same data retrieval helper.
Updating 'team' view and corpus.jade template.
Updating views to use less var declarations and more jade-style loops and iterators. Cleaning up code from server.js.