Merge branch 'node-class'

Conflicts:
	client/static/src/coffee/app.coffee
update gitignore
rm coffe-generated files from git