s
Merge branch 'master' of https://github.com/chanzler/piwik-traffic-by-device-type

Conflicts:
	lang/de.json