Merge branch 'master' into development
localization files reverted
Merge pull request #84 from UsabilityDynamics/development

Revert langs