Creating template
first
teste cakephp
Merge branch 'master' of ssh://php-wallacemaxters.rhcloud.com/~/git/php

Conflicts:
	app/View/Elements/footer.ctp
	app/View/Elements/sidebar.ctp
	app/View/Elements/top-menu.ctp
	app/webroot/css/default.css
	app/webroot/js/pastores/publicar.js
layout