fillSpace is 1000 now for infinite scroll
id is primary key for all actions
add room.identities on server side
check for text.threads,  welcome email text change
Merge branch 'master' into bug-fixes
temp fix for undefined uConns[action.from]
check for undefined nick
revert space changes
Merge branch 'master' into bug-fixes

Conflicts:
	.gitignore
	localStorage/localStorage-client.js
Merge pull request #150 from scrollback/bug-fixes

Bug fixes