Merge branch '7.x-1.x' of git.drupal.org:project/jquery_colorpicker into 7.x-1.x Conflicts: jquery_colorpicker.install