Merge pull request #121 from californiavol/master

Merge from master
Merge pull request #122 from californiavol/master

Merge from master
added playlist module
Merge pull request #124 from californiavol/macbook-branch

Macbook branch
Merge pull request #125 from californiavol/imac-work

Merge pull request #121 from californiavol/master
Merge pull request #128 from californiavol/webs-web1dev

Merge pull request #123 from californiavol/master
Merge pull request #129 from californiavol/master

Merge from master