mid-stroke, building out icon factories for detail panel
committing, no real changes, to merge
Merge branch 'master' of https://github.com/danavery/trailsy

Conflicts:
	styles/css/main.css
	styles/less/colors.less

"merge conflicts should be resolved"
activity icons for detail panel now implemented
added parking icon creation for trailhead amenities---others all null or not used, for now
logo added, sized to match 'Summmit County' with 'Length in Miles', happy to change
swapped out trailhead icons, which need to be restyled
Merge fix.
Trailhead icon size tweaks.