First step in merging client and server code
Fixing some more things
Finishing up changes for noscript stuff
Updating express, adding favicon
Fixing things
Merge branch 'develop'

Conflicts:
	.DS_Store