Hotfix encoding problem
Move pictures to res/
Merge branch 'master' into old-state