-Watermark imágnes
- Artículos ( orden artículos destacados)
gitIgnore
Merge branch 'master' of https://github.com/mushoq/wicaweb

Conflicts:
	.gitignore
	application/modules/core/controllers/Content/ContentController.php
	application/modules/core/views/scripts/content/content/edit.phtml
	application/modules/core/views/scripts/content/content/new.phtml