Merge commit 'aa4b9271f50d72c25a7150449b00274dccfd9295'

Conflicts:
	WebContent/ui/whoiswhere.view.js