Merge branch 'master' of github.com:rstane/playcast into design
Merge branch 'design'