undo manual work for font awesome
Merge branch 'develop' into nearbytrainerview
Add some temporary linkTos to allow navigating between our different routes.