Merge branch 'master' of github.com:cikorka/CakePHP-Template

Conflicts:
	Common/content.ctp
	Layouts/default.ctp
	README.md
	Scaffolds/Common/content.ctp
	Scaffolds/view.ctp