Doctors with same address are now shown in single marker. Markers are ugly now, as well as marker text. Will work on it later

	modified:   app/assets/javascripts/orangeproton.doctor.js
	modified:   app/assets/javascripts/orangeproton.trail.js
Merge branch 'development' of github.com:pse4/orange-proton into development