Merge branch 'master' into dev

composer.json

+{
+    "name": "ivanchepurnyi/ecomdev_phpunit",
+    "license": "OSL-3.0",
+    "type": "magento-module",
+    "description": "Magento PHPUnit Integration",
+    "homepage": "http://www.ecomdev.org/shop/code-testing/php-unit-test-suite.html",
+    "require": {
+        "magento-hackathon/magento-composer-installer": "dev-master",
+        "phpunit/phpunit": "3.6.*"
+    },
+    "authors":[
+        {
+            "name":"Ivan Chepurnyi"
+        }
+    ]
+}