Merge branch 'master' into ricardo
Merge branch 'master' into ricardo
100% playable on 1024x768 resolution screen
Merge branch 'ricardo'