Merge pull request #3 from OpenSourceFieldlinguistics/master

bringing in changes from upstream
Merge pull request #863 from cesine/master

Deployed all the improvements from yesterday into the onine app so people can see
Merge pull request #4 from OpenSourceFieldlinguistics/master

bringing in changes from upstream
Merge pull request #864 from cesine/master

Closing some more issues
Merge pull request #5 from OpenSourceFieldlinguistics/master

bringing in changes from upstream
added images for selecting different layouts in preferences
added buttons with images of dashboard layouts

(the buttons don't link to the actual layout handlebars yet though)
Merge pull request #4 from gretchenmcc/master

bringing in gretchenmccs new user preferences for the layouts