Base work added for settings panel
Merge branch 'master' of https://github.com/greenc/CookieMaster