merge
Merge branch 'develop' of https://github.com/czolnowski/piwik-external-dashboard into develop