Merge origin/master

Conflicts:
	application/configs/application.ini
	application/modules/admin/models/DbTable/Imagens.php
	application/modules/admin/views/scripts/index/index.phtml
	application/modules/default/controllers/BlogController.php
	application/modules/default/views/scripts/blog/index.phtml
	application/modules/default/views/scripts/header.phtml
	application/modules/default/views/scripts/index/index.phtml