VIdeos added + views/ratings/shares
Merge with new video-grid
Fixed merge issues with branch Mircea