firebase - added state restore by hash
Merge remote-tracking branch 'origin/master'

Conflicts:
	frontend/dist/app.js