.
fixes
put unicode
Merge branch 'import_strava' into test_import_onside

Conflicts:
	fonts/fontawesome-webfont.svg
Merge branch 'test_import_onside'