Add Settings screen. Load previous preferences in it. Rename a few bad files.
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu