added a manual db update
passing activity list to the view
made conflict query more efficient by focussing query to relevant domains
improved some of the templates
added js-scatterplot