Merge branch 'hotfix/addPopcorn' into develop
add popcorn
using old tweet collection
add quiz show styling
fix tweet link
fix youtube player api calls on video show
add quiz show hide elements in template, fix iframe html
Merge branch 'feature/enableVideoPause' into develop
Merge branch 'develop' of github.com:vyrak/shft into develop
remove livefyre js from main layout
bump version
Merge branch 'release/v0.2.5'
release