add countercache to videos
Merge remote-tracking branch 'upstream/master'
fix
fix
fix
Merge remote-tracking branch 'upstream/master'
add voting and comments to photos