Merge pull request #23 from wrongu/app-restructure

Save/Load series
changed default live-graph timespan to 3 hours. at 1-week it was crashing things!
Merge remote-tracking branch 'upstream/app-restructure'

Conflicts:
	server/static/js/commonsapi.js
Merge remote-tracking branch 'upstream/app-restructure' into app-restructure

Conflicts:
	server/static/js/commonsapi.js
Merge branch 'app-restructure'