adding configuration for mcgill
Merge pull request #1 from OpenSourceFieldlinguistics/master

bringing in last months changes
merging in all updates from the past month and fixing merge conflicts in the messages and in manifests.
Merge pull request #2 from OpenSourceFieldlinguistics/master

Bringing in new import dashboard and localization
Merge branch 'master' of git://github.com/cesine/FieldDB
added new folder for Dialog, copied contents of datalist folder and renamed as dialogs
changed session icon to a calendar, added some infrastructure for Conversations, specifically giving them datum fields like speaker, location, context, all within the corpus edit view.
deleted the badly-named dialog folder and its contents
upping the version to 1.30.1
Edited helptext in corpus view > datum field settings

Made helptext shorter, add examples of what each datum field could look
like, and fixed typos.
Added paragraph breaks and clarified text in corpus settings descriptions

Text is less wall-y now! Also tried to make instructions clearer and
more consistent with each other and with the app as it is now.

I don't think there is an "All Data" link, so I took that instruction
out. Instead I told them to search for a blank term.
minor wording change

I think people say "hit" enter instead of "push" enter.
Changed search "more info" link to "more about MapReduce"
cleaning up the messages json so that in-text double quotes were swapped out for single quotes
connected up app so that the external structures for making a new conversation work; all actual conversation code has yet to be written
added the start of some html for conversation time logging bar, specifically two boxes overlaid on each other with different colours
turning the test runner back on
Merge pull request #5 from Kedersha/master

Bringing in changes from kedersha and gretchenmcc
upgrading jquery to 1.8.3
preparing for release, adding icons on the new menu, dont know why we didnt do that before fixes #739