Remove PHP 5 and fix copyright in top docblocks
Merge pull request #50 from bcrowe/fix-php5

Remove PHP 5 and fix copyright in top docblocks
Correct filename for cli bootstrap
Merge pull request #51 from dereuromark/master-cli

Correct filename for cli bootstrap
update composer.json
Merge pull request #52 from php-engineer/master-composer

update composer.json
Merge branch 'master' of https://github.com/cakephp/app

Conflicts:
	App/Console/Command/AppShell.php
	composer.json