Merge branch 'master' of https://github.com/senhorzinho/FieldDB

pulled from senhorzinho to get the latest code for spreadsheet.
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB
moving localisation to Render #1146
Merge pull request #1167 from cesine/master

Release 1.74
moving localization to backbone render
merging upstream, solved conflict
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
moved localization functions to backbone render, changed handlebars accordingly. however the page isn't rendering, error msg locale_We_need_to_make_sure_its_you is not defined UserAppView.js 174
adding changes that haven't been added #1146
put locales inside quotes, those locales serve as strings
quotes were missing, put locales inside quotes
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
en and es have corresponding message items
putting locales function in right places
to unescape html tags used in json messages, use three curly braces
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