Merge branch 'hotfix/0.3.1'
Update client.js
Bump version number 0.3.1 for hot fix.
Fix: Stale background data persistence (attempt #2)
Merge branch 'hotfix/0.3.2' into develop

Conflicts:
	static/js/client.js