Merge pull request #142 from californiavol/webs-web1dev

Merge pull request #141 from californiavol/master
Merge pull request #143 from californiavol/master

Merge from master
added cover image for video library
updated library layout

added cover image, 4 column gallery
minor updates to library layout
added playlist module

required a bootstrap in the module directory to enable controllers to
find models
added playlist model

model requires bootstrap file in module directory
Merge pull request #144 from californiavol/imac-work

Imac work
Merge pull request #145 from californiavol/macbook-branch

Merge pull request #143 from californiavol/master
Merge branch 'master' into macbook-branch
switched db tables
changed .ignore

changed .ignore so that .zfproject.xml is tracked
added secondary sac state logo to admin layout
Merge pull request #146 from californiavol/macbook-branch

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

added secondary sac state logo to admin layout
Merge branch 'master' into imac-work
added global header partial for layouts
added rss icon to course feed list
added htmlpurifier

created custom filter for forms using htmlpurifier
Merge pull request #148 from californiavol/imac-work

Imac work