Merge branch 'master' into remove-google-analytics

Author: olleolleolle

app/assets/javascripts/application.js

@@ -22,7 +22,6 @@
 //= require pickadate/picker
 //= require pickadate/picker.date
 //= require pickadate/picker.time
-//= require gosquared
 //= require subscriptions-toggle
 //= require invitations
 //= require cocoon