Refloat video boxes and add bg colors
add number to video-box
fix submit-video
before merge
fix conflict
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore into merge/video_page_buck
fix merge conflict
Merge pull request #91 from tihuan/merge/video_page_buck

Merge/video page buck