Merge branch 'qa' into stage

Author: yeliparra

.editorconfig

@@ -4,7 +4,7 @@
 root = true
 
 [*]
-indent_style = space
+indent_style = tab
 indent_size = 4
 end_of_line = lf
 insert_final_newline = true
@@ -14,5 +14,5 @@ trim_trailing_whitespace = true
 end_of_line = crlf
 
 [*.yml]
-indent_style = space
+indent_style = tab
 indent_size = 2

.gitattributes

@@ -34,3 +34,5 @@
 *.mo binary
 *.pdf binary
 *.phar binary
+*.eot binary
+*.ttf binary

.gitignore

@@ -2,3 +2,7 @@
 /config/app.php
 /tmp/*
 /logs/*
+/webroot/cache_css/*
+/webroot/cache_js/*
+/files/*
+/plugins/Showcase

composer.json

@@ -1,40 +1,56 @@
 {
-    "name": "cakephp/app",
-    "description": "CakePHP skeleton app",
-    "homepage": "http://cakephp.org",
-    "type": "project",
-    "license": "MIT",
-    "require": {
-        "php": ">=5.5.9",
-        "cakephp/cakephp": "~3.2",
-        "mobiledetect/mobiledetectlib": "2.*",
-        "cakephp/migrations": "~1.0",
-        "cakephp/plugin-installer": "*"
-    },
-    "require-dev": {
-        "psy/psysh": "@stable",
-        "cakephp/debug_kit": "~3.2",
-        "cakephp/bake": "~1.1"
-    },
-    "suggest": {
-        "phpunit/phpunit": "Allows automated tests to be run without system-wide install.",
-        "cakephp/cakephp-codesniffer": "Allows to check the code against the coding standards used in CakePHP."
-    },
-    "autoload": {
-        "psr-4": {
-            "App\\": "src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "App\\Test\\": "tests",
-            "Cake\\Test\\": "./vendor/cakephp/cakephp/tests"
-        }
-    },
-    "scripts": {
-        "post-install-cmd": "App\\Console\\Installer::postInstall",
-        "post-autoload-dump": "Cake\\Composer\\Installer\\PluginInstaller::postAutoloadDump"
-    },
-    "minimum-stability": "stable",
-    "prefer-stable": true
+	"name": "cakephp/app",
+	"description": "CakePHP skeleton app",
+	"homepage": "http://cakephp.org",
+	"type": "project",
+	"license": "MIT",
+	"require": {
+		"php": ">=5.5.9",
+		"cakephp/cakephp": "~3.2",
+		"mobiledetect/mobiledetectlib": "2.*",
+		"cakephp/migrations": "~1.0",
+		"cakephp/plugin-installer": "*",
+		"markstory/asset_compress": "~3.0",
+		"cakedc/showcase": "dev-master"
+	},
+	"require-dev": {
+		"psy/psysh": "@stable",
+		"cakephp/debug_kit": "~3.2",
+		"cakephp/bake": "~1.1"
+	},
+	"suggest": {
+		"phpunit/phpunit": "Allows automated tests to be run without system-wide install.",
+		"cakephp/cakephp-codesniffer": "Allows to check the code against the coding standards used in CakePHP."
+	},
+	"autoload": {
+		"psr-4": {
+			"App\\": "src"
+		}
+	},
+	"config": {
+		"secure-http": false
+	},
+	"extra": {
+		"installer-paths": {
+			"plugins/Showcase": ["cakedc/showcase"]
+		}
+	},
+	"repositories": [
+		{
+			"type": "vcs",
+			"url": "[email protected]:cakedc/showcase.git"
+		}
+	],
+	"autoload-dev": {
+		"psr-4": {
+			"App\\Test\\": "tests",
+			"Cake\\Test\\": "./vendor/cakephp/cakephp/tests"
+		}
+	},
+	"scripts": {
+		"post-install-cmd": "App\\Console\\Installer::postInstall",
+		"post-autoload-dump": "Cake\\Composer\\Installer\\PluginInstaller::postAutoloadDump"
+	},
+	"minimum-stability": "dev",
+	"prefer-stable": true
 }