Merge branch 'master' into aperez-edit-poll-question-answers

config/routes.rb

@@ -300,11 +300,11 @@ Rails.application.routes.draw do
         end
       end
 
-      resources :questions do
+      resources :questions, shallow: true do
         resources :answers, except: [:index, :destroy, :delete], controller: 'questions/answers', shallow: true do
           resources :images, controller: 'questions/answers/images'
+          resources :videos, controller: 'questions/answers/videos'
         end
-
       end
     end