Merge pull request #126 from AgileVentures/develop

Deploying to staging
Merge pull request #127 from AgileVentures/staging

Deploying to Production
Merge pull request #133 from AgileVentures/develop

Deploying to staging
Merge pull request #136 from AgileVentures/develop

Deploying to staging - missing assets
Merge pull request #134 from AgileVentures/staging

Deploying to Production
Merge pull request #139 from AgileVentures/develop

Deploying to Staging
Merge pull request #140 from AgileVentures/develop

Update .travis.yml
Merge pull request #149 from AgileVentures/develop

Pushing to Staging
Merge pull request #150 from AgileVentures/staging

Pushing to Production
changed to HTML5 player - tbc
merge with develop
Merge pull request #152 from AgileVentures/develop

Pushing to Staging
Merge pull request #153 from AgileVentures/staging

Pushing to Production
initial commit: adding events_feature
Merge pull request #157 from AgileVentures/develop

Deploying to Staging
Merge pull request #158 from AgileVentures/develop

Deploying to Production
refactoring auth controller spec
added specs for youtube
small updates to auth controller, taking merge from yaro
Merge remote-tracking branch 'yaro/auth-controller-refactoring' into auth-controller-refactoring