Actualización Bootstrap 3 en FrontEnd
Merge branch 'master' of https://github.com/mushoq/wicaweb

Conflicts:
	application/modules/default/views/scripts/index/index.phtml
	application/modules/default/views/scripts/partials/webtemplate4.phtml