adding learning app pdf for reference
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB
changed the base db url to lingsync
changed the base db url to lingsync
hide the unicode for lesson edit, we don't need unicode
Merge branch 'master' of github.com:hisakonog/FieldDB

pulled from origin
Merge pull request #10 from OpenSourceFieldlinguistics/master

Updates merging updates from the master branch
pulled from upstrema and resolved merge conflict
including locales in view html files
adding locales to views html files
Merge branch 'master' into spreadsheetHtmlLocales

Conflicts:
	angular_client/modules/spreadsheet/app/views/adapting-columnar-template-edit.html
	angular_client/modules/spreadsheet/app/views/corpussettings.html
	angular_client/modules/spreadsheet/app/views/faq.html
	angular_client/modules/spreadsheet/app/views/main.html
	angular_client/modules/spreadsheet/app/views/modals.html
	angular_client/modules/spreadsheet/app/views/settings.html
using contextualize function to do localization in spreadsheet
adding localization strings of new faq since html was localized
trying to avoid phase errors
Merge pull request #1779 from cesine/spreadsheetHtmlLocales

Spreadsheet html locales