Query and eventUser mapping.
Mappings.
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/views/top-menu.html