Sync'd with en-us file
Merge branch 'master' into iwehrman/issue-114

Conflicts:
	nls/fr/strings.js