Merge remote-tracking branch 'origin/branch1' into branch4

Conflicts:
	app.js