tidying up
annotations refresh on close popup/submit and added load function for scatter plot
mergeconflicts
OMG annotations. We got timeseries and point location annotations like for real
merging
took random number away
merging conflict in css