adding lots of changes
merging
Merge pull request #46 from dssg/webapp-updates

Webapp updates