Merge branch 'app-restructure'
Merge branch 'app-restructure'
Merge remote-tracking branch 'upstream/app-restructure'

Conflicts:
	server/static/js/commonsapi.js
Merge branch 'app-restructure'
analyze.html small bugfixes. sharing live graphs uses relative timespan.
Merge remote branch 'wrongu/master'
fixed bug where graph would load before series were updated