fixed globalize bug
solved merge conflicts
Merge pull request #430 from massiveart/bugfix/globalize-extension

fixed globalize bug