refactoring
Merge branch '7.x-1.x-panels' of github.com:gusaus/pushtape_video into 7.x-1.x-panels
merge