Observe #chicken and trap More Info clicks into Info panel
Merge branch 'master' of github.com:mustardhamsters/panopticon-ushahidi

Conflicts:
	main/main.js