Merge pull request #5 from cesine/master

A UI for uploading for you to test entire flow with
Updates Issue #25 to work on listing Couch info as CSV for automatic import into Lucene/Solr. Trying this way in order to dynamically generate column headers for schema matching.
Working on issue #25 — Will have to refactor the logic, as not all results returned will have data for each column field.
Issue #25 Update map.js for "get_corpus_fields" to return complex keys and update the list view "get_data_as_csv" to handle data fields that may already have quotation marks in them.
Merge branch 'master' of git://github.com/OpenSourceFieldlinguistics/FieldDB
OpenSourceFieldlinguistics/FieldDB#1148 Now displaying utterance line in update activity. (was supposed to be doing this, but there was a bug in the code)
Merge branch 'master' of git://github.com/OpenSourceFieldlinguistics/FieldDB
GRUNT.JS: Files linted per JSHint; set up (and tested) grunt build that concatenates all js into one file and minifies it. Working well so far.
Updating Gruntfile and gitignore (for new spreadsheet build files).
Setting up jasmine unit testing in grunt.
Grunt file now set up for unit testing (jasmine) and running smoothly.
Adding some non-breaking spaces to account for html minification; also de-selecting active row on page change.
More non-breaking spaces.
spreadsheet datemodified has a set of quotes less than the backbone app, so it was always showing the last datum edited in the spreadsheet app, rather than last edited anywhere
Merge pull request #6 from OpenSourceFieldlinguistics/master

Updating local files
Import from Toolbox format now accomodates items that begin with any field label and metadata

Before, import from Toolbox format assumed that items began with \ge,
but not all toolbox files do this, so now it searches for the first
instance of backslash+alphabetic characters+space and uses this label
to delimit items

Also, material from before this first toolbox label is ignored for the
purposes of the actual data array and instead it's treated as metadata
and added to the "goal" field on import

Fixes #1176
Merge pull request #1178 from gretchenmcc/master

Import from Toolbox format now accommodates metadata and items that begin with any field label
Merge branch 'master' of https://github.com/OpenSourceFieldlinguistics/FieldDB
Added ambiguous tree in Quechua

Fixes #927
for #929 added function to guess QTrees for a morphemes line

Conflicts:
	backbone_client/datum/DatumEditView.js