remove video upload
add grunt
fix conflict commit
fix conflict