Merge branch 'master' into js-events

Conflicts:
	vendor/assets/javascripts/foundation/jquery.foundation.buttons.js
	vendor/assets/javascripts/foundation/jquery.foundation.forms.js

diff --cc vendor/assets/javascripts/foundation/jquery.foundation.buttons.js
index 279c4ea810539df2fb7d730290f25ca14a02b106,d294fc2596502dfba317de71db2b650616f75cb1..3f1b09d9dee7b70aa1a42ed4b79b5485fe3598b6
--- 1/vendor/assets/javascripts/foundation/jquery.foundation.buttons.js
--- 2/vendor/assets/javascripts/foundation/jquery.foundation.buttons.js
+++ b/vendor/assets/javascripts/foundation/jquery.foundation.buttons.js
@@@ -1,14 -1,14 +1,14 @@@
  (function ($) {
 -  
 -  $.fn.foundationButtons = function(options) {    
 +
 +  $.fn.foundationButtons = function(options) {
      // Prevent event propagation on disabled buttons
 -    $('.button.disabled', this).on('click.fndtn', function (event) {
 -      event.preventDefault();
 +    $(document).on('click.fndtn', '.button.disabled', function (e) {
 +      e.preventDefault();
      });
 -    
 +
      $('.button.dropdown > ul', this).addClass('no-hover');
  
-     $(document).on('click.fndtn', '.button.dropdown', function (e) {
 -    $('.button.dropdown, .button.dropdown.split span', this).on('click.fndtn', function (e) {
++    $(document).on('click.fndtn', '.button.dropdown, .button.dropdown.split span', function (e) {
        // Stops further propagation of the event up the DOM tree when clicked on the button.
        // Events fired by its descendants are not being blocked.
        if (e.target === this) {

diff --cc vendor/assets/javascripts/foundation/jquery.foundation.forms.js
Simple merge