Charms bar and simple layout
merger from remote
Merge pull request #2 from chunchill/master

merge