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

Internationalization
first cuke is going RED on me. Not a good sign ;-)
Merge remote-tracking branch 'thomas/develop' into develop
'Create a website' feature complete.
Merge remote-tracking branch 'upstream/develop' into develop