Merge branch 'master' of git://github.com/cesine/FieldDB
fixed #750 the comment was adding a timestamp and user etc even if the comment was already existing.
added port 6984 to the manifest for iriscouch, but then realized we are doing it server side on the permissions
Revert "added port 6984 to the manifest for iriscouch, but then realized we are doing it server side on the permissions"

This reverts commit 8c3a0d66ce82d762bea99c613d81a75faaa9e305.
taking the port off the iriscouch, realized we were doing it server side
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB
navbar edits so the search box is level with the other buttons, started implementing the collapse feature
adding try catch around potentially missing datum fields
moving everything into a couchapp so we can run out of a touchdb on the Android
moving scripts into a scripts folder
upgrading version of OPrime
moving skins to user module and icons into images folder cleaning up
updating build debug script to deploy to couch app
app is running in a couchapp
updating bootstrap and font awesome to be useable on a tablet fixes #758
all sorts of workarounds for #759 until it has a permanent fix in bootstrap. fixes #759
turning the Locale into an object with a function to protect against cases where the string is missing
centralizing all activity saves to one place TODO save them without need for activity feeds for #755
not getting a session token if the user is using an Android
removing comments