Resolution start
Merge branch 'master' of https://github.com/willianmk/Object-Calisthenics

Conflicts:
	project/calisthenics/application/modules/cms/models/Cms.php
	project/calisthenics/tests/application/modules/Cms/Model/CmsTest.php