Time and Storage and Synch

updated time() and storage()
resynching
Merge branch 'master' of https://github.com/AndrejHronco/noisepage

Conflicts:
	scripts/app.js
	scripts/recorderjs/recorder.js
	scripts/recorderjs/recorderWorker.js