Merge pull request #5 from tochman/develop

Assets
added skeleton code for internationalization
Merge remote-tracking branch 'upstream/develop' into develop
first cuke is going RED on me. Not a good sign ;-)