Merge pull request #6 from MartinvanZ/dev

Release 1.1
File layout
add Chinese translation
Merge branch 'master' into dev