replaced adv search message with the latest one, as it wasn't updated for some reason
added datum state dropdown to datalist edit html. in the datalistView it gets datum states from corpus and sets 'To be checked' as datalist default, see #685
adding datum state select dropdown to the datalist. Have To Be Checked as the default datum state to show on the datalist. Checkboxes are behaving funny, needs more fixing.
corrected typo
pulled from upstream, solve merge conflict
Merge pull request #1 from OpenSourceFieldlinguistics/master

bringing in changes from upstream
got rid of some tiny white lines around the logo
Merge pull request #763 from cesine/master

New activity feed widgets are going in the next release!
leftover messing around with navbar to be overwritten with newer code
trying to merge in new changes
changed import so that it clears the datumfields and you don't get leftover search terms
Merge pull request #764 from senhorzinho/master

Pull request: new activity feed popup
moving src to client, adding a manifest to the main module so we can test, and addign require js to handle minificaiton.
formatting
updating the switch to scripts to the new folder structure
fixes #747 @gretchenmcc thanks for the guide! i made it show as we discussed, five times (telling the  user how many times are left) and if the user hasnt logged in after 5 days, the count is reset so that they can get a refresher... @kedersha and I changed the navigation bar so that it is no longer broken, and it works with the most recent backbone so this means your illustration guide is a bit out of date but it is directly linked from the drawing so there is a high chance that if we update teh drawing it will be updated in the app.
for #514 and #567 fixes #479 cleaned up the prepartion of the activity feeds to go in the same place as the other objects now the dashboard is stable, and can sync multiple times. this is a big change
putting hover color back in, and making the zebras flavors of grey so they will work in any app theme
adding routes and using the non-minified activity feed
tested routes and wrote TODOs that are needed to make the new activity feeds. both in the angular and in the nodejs