Updated version numbers in package.json
Put jquery in the right spot
Merge branch 'webby' into reactclient

Conflicts:
	public/client.html
Wired up infinite scroll with mock libsb
Limits to infinite scroll
Forgot to add mock-libsb
Added infinite.less file
Merge branch 'webby' into reactclient

Conflicts:
	public/client.html
	public/s/components/chat-area.js
	public/s/components/infinite.js
Improvements to infinite scroll
Merge branch 'reactclient' into webby

Conflicts:
	public/client.html
	public/s/components/chat-area.js
Merge branch 'reactclient' into webby

Conflicts:
	public/client.html
	public/s/components/chat-area.js