add file templates for branches
add devdependencies and provide a bundle script
Merge branch 'master' into eventstream

Conflicts:
	client/client.js
	package.json
	server.js