Merge branch 'master' into tracking_user_verifications_and_others

Conflicts:
	app/controllers/admin/stats_controller.rb
	db/dev_seeds.rb

app/assets/javascripts/application.js

@@ -43,6 +43,7 @@
 //= require forms
 //= require tracks
 //= require valuation_spending_proposal_form
+//= require embed_video
 
 var initialize_modules = function() {
   App.Comments.initialize();
@@ -61,6 +62,7 @@ var initialize_modules = function() {
   App.Forms.initialize();
   App.Tracks.initialize();
   App.ValuationSpendingProposalForm.initialize();
+  App.EmbedVideo.initialize();
 };
 
 $(function(){

app/assets/javascripts/embed_video.js.coffee

@@ -0,0 +1,7 @@
+App.EmbedVideo =
+  
+  initialize: ->
+    $('#js-embedded-video').each ->
+      code    = $(this).data("video-code")
+      $('#js-embedded-video').html(code)
+    

app/assets/javascripts/votes.js.coffee

@@ -5,11 +5,13 @@ App.Votes =
       $("div.anonymous-votes", votes).show();
       $("div.organizations-votes", votes).show();
       $("div.not-logged", votes).show();
+      $("div.no-supports-allowed", votes).show();
       $("div.logged", votes).hide();
     , ->
       $("div.anonymous-votes", votes).hide();
       $("div.organizations-votes", votes).hide();
       $("div.not-logged", votes).hide();
+      $("div.no-supports-allowed", votes).hide();
       $("div.logged", votes).show();
 
   initialize: ->