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(){