Update app.js
Merge remote-tracking branch 'WebPortal_GitHub/master' into LoginBox

Conflicts:
	app.js