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
Merge branch 'myaamia'

Conflicts:
	backbone_client/datum/datum_edit_embedded.handlebars
	backbone_client/datum/datum_read_embedded.handlebars
undoing some of the myaamia changes
Merge pull request #1358 from cesine/myaamia

Myaamia branch