Hopefully working persistence (finally).
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.js
	src/models/user.js
	window.html
Don't merge.