wer
Merge branch 'master' of https://github.com/fzzio/cmweb

Conflicts:
	application/views/celmedia/proyecto.php
remover heads