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