kleiner fix

Conflicts:
	app.js