øivind fiks console.log
Merge origin/master

Conflicts:
	web/js/app.js