Merge branch 'master' of github.com:eleddy/collective_stats_logviewer
Merge branch 'master' of github.com:plesf/collective_stats_logviewer