Merge branches 'develop' and 'feature/7-readme-file' of github.com:anitawlosek/ng-piwik into develop
Merge branch 'feature/7-readme-file' of github.com:anitawlosek/ng-piwik into develop
travis config
Merge remote-tracking branch 'origin/develop' into develop