Marker and Pop-Up Updates

Added all markers to the map with 3 different specie types. Changed
pop-up position from left to centre.
Merge branch 'master' of https://github.com/ruskam

Conflicts:
	web/js/globalVar.js