botones casi fade, galeria, programa
Merge branch 'master' of https://github.com/lifofernandez/PROTEXTIL13

Conflicts:
	library/css/bootstrap.css
	library/less/theme.less
	lifo_library/lifo_functions.php