2OCT 2014 INDEX
Merge origin/master
 INDEX
Merge origin/master

Conflicts:
	laravel/app/views/contenido/index.blade.php
6oct2014.
Iconos en el index
Merge origin/master