last commit
Merge branch 'master' of https://github.com/Claudo/cms

Conflicts:
	application/controllers/blocks.php
	application/models/blocks.php
	application/views/blocks/home.blade.php