Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB

pulled from upstream.
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB

Pulled from upstream, lots of changes
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB

pulled from upstream
.
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB
working on comments in datum
merging conflicts in data list and conversation. need to review this later...
reverting merge manually by copying from cesine into local files
comment edit was controled in datum handlebars, put it back to commentedit handlebars. should do the same for session datalist etc.
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB

Pulled from upstream
olde comments are pushed down to the bottom, newer comments show on top. use unshift instead of add.
manifest changed to new server
changed manifest to the new server, pulled from gina master, resolved merge conflict.
refactoring comments. Moved window.app.addActivity from DatumEditView to Comment.js under commentCreatedActivity. this will handle association btwn comment and a module. made assoc in DatuReadView but the click event doesn't seem to be working.
comment refactoring so that comments are dealt with by Comment from which Views of each module grab comments. Assoc btwn comments and the module hasn't been coded yet.
click add-new-comment had another function in DatumReadView, that's why click wasn't working. Removed extra function.
just a small editing of the commented-out lines, and removed some spaces
merged with upstream, solved conflicts
removed unnecessary divs in conversation handlebars
updated bootstrap from 2.2.1 to 2.3.0
rendering comment Views use .find instead of simple this, so that comments will be found even when deeply embedded.