resolving cherry-picking
cherry pick
added en-US-financial and en-US-metric languages

Conflicts:
	languages.js
	languages/en-US-financial.js
	tests/languages/en-US-financial.js
added concat to grunt test, since npm test was failing without it (stale languages.js file)
fixed merge mistake