Added Bootstrap styles

need to fix the bootstrap style for the tool tip more
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/mapStyle.css