Updated .gitignore, synced app & skel

Added some good practice rules from https://help.github.com/articles/ignoring-files to gitignore
Changed .gitignore to only ignore /app/Config/database.php instead of all files in /app/Config/ (helps to keep it in sync with its skel folder!)

Brought \app\ and \lib\Cake\Console\Templates\skel\ in sync
Fixed various @Package annotations in \app\
Fixed various @Package annotations in \lib\Cake\Console\Templates\skel\

Author: ravage84

.gitignore

@@ -1,9 +1,21 @@
-/app/Config
+# User specific & automatically generated files #
+#################################################
+/app/Config/database.php
 /app/tmp
 /lib/Cake/Console/Templates/skel/tmp/
 /plugins
 /vendors
 /build
 /dist
-.DS_Store
 /tags
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db

app/Config/Schema/i18n.php

@@ -20,19 +20,15 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-// @codingStandardsIgnoreStart
-
-/*
+/**
  *
  * Using the Schema command line utility
  *
  * Use it to configure database for i18n
  *
  * cake schema run create i18n
  */
-class i18nSchema extends CakeSchema {
-
-// @codingStandardsIgnoreEnd
+class I18nSchema extends CakeSchema {
 
 	public $name = 'i18n';
 

app/Config/core.php

@@ -95,7 +95,7 @@
  *
  * And uncomment the App.baseUrl below. But keep in mind
  * that plugin assets such as images, CSS and Javascript files
- * will not work without url rewriting
+ * will not work without url rewriting!
  * To work around this issue you should either symlink or copy
  * the plugin assets into you app's webroot directory. This is
  * recommended even when you are using mod_rewrite. Handling static

app/Config/database.php.default

@@ -18,13 +18,7 @@
  * @package       app.Config
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-/**
- * In this file you set up your database connection details.
  *
- * @package       cake.config
- */
-/**
  * Database configuration class.
  * You can specify multiple configurations for production, development and testing.
  *

app/Config/email.php.default

@@ -18,13 +18,7 @@
  * @package       app.Config
  * @since         CakePHP(tm) v 2.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-/**
- * In this file you set up your send email details.
  *
- * @package       cake.config
- */
-/**
  * Email configuration class.
  * You can specify multiple configurations for production, development and testing.
  *

app/Console/cake

@@ -13,7 +13,7 @@
 #
 # @copyright    Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 # @link         http://cakephp.org CakePHP(tm) Project
-# @package      cake.Console
+# @package      app.Console
 # @since        CakePHP(tm) v 1.2.0.5012
 # @license      MIT License (http://www.opensource.org/licenses/mit-license.php)
 #

app/Console/cake.bat

@@ -11,7 +11,7 @@
 ::
 :: @copyright		Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
 :: @link		http://cakephp.org CakePHP(tm) Project
-:: @package   		app.Console
+:: @package   	app.Console
 :: @since		CakePHP(tm) v 2.0
 :: @license		MIT License (http://www.opensource.org/licenses/mit-license.php)
 ::

app/Console/cake.php

@@ -23,10 +23,13 @@
 
 if (function_exists('ini_set')) {
 	$root = dirname(dirname(dirname(__FILE__)));
+
+	// the following line differs from its sibling
+	// /lib/Cake/Console/Templates/skel/Console/cake.php
 	ini_set('include_path', $root . $ds . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
 }
 
-if (!include ($dispatcher)) {
+if (!include($dispatcher)) {
 	trigger_error('Could not locate CakePHP core files.', E_USER_ERROR);
 }
 unset($paths, $path, $dispatcher, $root, $ds);

app/Controller/AppController.php

@@ -20,7 +20,6 @@
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-
 App::uses('Controller', 'Controller');
 
 /**
@@ -29,8 +28,8 @@
  * Add your application-wide methods in the class below, your controllers
  * will inherit them.
  *
- * @package       app.Controller
- * @link http://book.cakephp.org/2.0/en/controllers.html#the-app-controller
+ * @package		app.Controller
+ * @link		http://book.cakephp.org/2.0/en/controllers.html#the-app-controller
  */
 class AppController extends Controller {
 }

app/Controller/PagesController.php

@@ -19,7 +19,6 @@
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-
 App::uses('AppController', 'Controller');
 
 /**