Added standardized channel to data rows
Merge branch 'master' of https://github.com/dzeber/fxos-metrics

Conflicts:
	shared/ftu_formatter.py