Fixing POR-666
Fixing conflicts with Fede
Merge remote-tracking branch 'upstream/master'

Conflicts:
	alert.js
Fixing conflicts between POR-666 and BKO
Merge remote-tracking branch 'upstream/master'

Conflicts:
	alert.js