Hope this works... may need replay.
Merge branch 'dev' into patch-5-localization-migration

I have modified a few files outside of the original scope, but everything in here occurs:

A: Changes made by Johann.
B: Changes made by Nathan WITHIN webui/app/scripts/nls/.

In other words, there should be nothing to think about other than stuff inside webui/app/scripts/nls/.

Conflicts:
	webui/app/scripts/nls/root/labels.js
This moves the comments from the "top" of the file to the bottom, allowing for easier non-js parsing.
Merge pull request #102 from v6/patch-5-localization-migration

Pull Request - Added Localization