Started adding probability markers to hex labels
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/pilgrims_view.xslt
	war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	war/WEB-INF/classes/pilgrims_view.xslt