first development commit
Merge branch 'master' of https://github.com/abrandao/cakecms

Conflicts:
	.gitignore