updated
Merge branch 'master' of https://github.com/gnowledge/pandora-mobile-app
new clip views