pre-merge
Merge branch 'master' of https://github.com/tomwayson/tripin-dashboard
changes to count rendering
updates for favicon displlay
Merge branch 'master' of https://github.com/tomwayson/tripin-dashboard