tests
Merge branch 'canary' into canaryFork
Merge remote-tracking branch 'fork/canary' into canaryFork

Conflicts:
	test/unit/service/translate.spec.js
change implementation to one function for single or multi fallback languages