Merge branch 'master' into 1.0

Conflicts:
	composer.json

Author: comur

Resources/views/Form/croppable_image_modal.html.twig

@@ -14,7 +14,7 @@
 <script src="{{ asset('bundles/comurimage/js/jquery.Jcrop.min.js') }}"></script>
 <script src="{{ asset('bundles/comurimage/js/jquery.color.js') }}"></script>
 {% if include_holder is not defined or include_holder %}
-    <script src="{{ asset('bundles/comurimage/components/holder/holder.min.js') }}"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/holder/2.5.2/holder.min.js"></script>
 {% endif %}
 {% if include_bootstrap is not defined or include_bootstrap %}
     <script src="{{ asset('bundles/comurimage/js/bootstrap.min.js') }}"></script>

composer.json

@@ -25,8 +25,7 @@
         "twig/twig": "~1.12",
         "twig/extensions": "~1.0",
         "friendsofsymfony/jsrouting-bundle": "@stable",
-        "jms/translation-bundle": "@stable",
-        "imsky/holder": "2.5.*"
+        "jms/translation-bundle": "@stable"
     },
     "target-dir": "Comur/ImageBundle",
     "autoload": {
@@ -36,8 +35,5 @@
         "branch-alias": {
             "dev-master": "1.0-dev"
         }
-    },
-    "config": {
-        "component-dir": "Resources/public/components"
     }
 }