-Added comment
Merge remote-tracking branch 'origin/master'
-Fixed bug on the localization js mechanism when trying to get a value
with an empty language map
Merge remote-tracking branch 'origin/master'