merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/ui/whoiswhere.view.js