added skeleton code for internationalization
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #6 from yggie/develop

Internationalization