a un dia
a un dia
Merge branch 'master' of https://github.com/lifofernandez/PROTEXTIL13

Conflicts:
	index.php
	index.php.bk
	library/css/bootstrap.css
	library/less-bk/accordion.less
	library/less-bk/alerts.less
	library/less-bk/badges.less
	library/less-bk/bootstrap.less
	library/less-bk/breadcrumbs.less
	library/less-bk/button-groups.less
	library/less-bk/buttons.less
	library/less-bk/carousel.less
	library/less-bk/close.less
	library/less-bk/code.less
	library/less-bk/component-animations.less
	library/less-bk/dropdowns.less
	library/less-bk/forms.less
	library/less-bk/glyphicons.less
	library/less-bk/grid.less
	library/less-bk/hero-unit.less
	library/less-bk/input-groups.less
	library/less-bk/jumbotron.less
	library/less-bk/labels-badges.less
	library/less-bk/labels.less
	library/less-bk/layouts.less
	library/less-bk/list-group.less
	library/less-bk/media.less
	library/less-bk/mixins.less
	library/less-bk/modals.less
	library/less-bk/navbar.less
	library/less-bk/navs.less
	library/less-bk/normalize.less
	library/less-bk/pager.less
	library/less-bk/pagination.less
	library/less-bk/panels.less
	library/less-bk/popovers.less
	library/less-bk/print.less
	library/less-bk/progress-bars.less
	library/less-bk/reset.less
	library/less-bk/responsive-1200px-min.less
	library/less-bk/responsive-767px-max.less
	library/less-bk/responsive-768px-979px.less
	library/less-bk/responsive-navbar.less
	library/less-bk/responsive-utilities.less
	library/less-bk/responsive.less
	library/less-bk/scaffolding.less
	library/less-bk/sprites.less
	library/less-bk/tables.less
	library/less-bk/theme.less
	library/less-bk/thumbnails.less
	library/less-bk/tooltip.less
	library/less-bk/type.less
	library/less-bk/utilities.less
	library/less-bk/variables.less
	library/less-bk/wells.less
	library/less/theme.less
	lifo_library/add_ons/lightbox-1/README.markdown
	lifo_library/add_ons/lightbox-1/css/lightbox.css
	lifo_library/add_ons/lightbox-1/css/screen.css
	lifo_library/add_ons/lightbox-1/img/close.png
	lifo_library/add_ons/lightbox-1/img/demopage/donate.png
	lifo_library/add_ons/lightbox-1/img/demopage/favicon.ico
	lifo_library/add_ons/lightbox-1/img/demopage/image-1.jpg
	lifo_library/add_ons/lightbox-1/img/demopage/image-2.jpg
	lifo_library/add_ons/lightbox-1/img/demopage/image-3.jpg
	lifo_library/add_ons/lightbox-1/img/demopage/image-4.jpg
	lifo_library/add_ons/lightbox-1/img/demopage/image-5.jpg
	lifo_library/add_ons/lightbox-1/img/demopage/image-6.jpg
	lifo_library/add_ons/lightbox-1/img/demopage/thumb-1.jpg
	lifo_library/add_ons/lightbox-1/img/demopage/thumb-2.jpg
	lifo_library/add_ons/lightbox-1/img/demopage/thumb-3.jpg
	lifo_library/add_ons/lightbox-1/img/demopage/thumb-4.jpg
	lifo_library/add_ons/lightbox-1/img/demopage/thumb-5.jpg
	lifo_library/add_ons/lightbox-1/img/demopage/thumb-6.jpg
	lifo_library/add_ons/lightbox-1/img/loading.gif
	lifo_library/add_ons/lightbox-1/img/next.png
	lifo_library/add_ons/lightbox-1/img/prev.png
	lifo_library/add_ons/lightbox-1/index.html
	lifo_library/add_ons/lightbox-1/js/jquery-1.10.2.min.js
	lifo_library/add_ons/lightbox-1/js/lightbox-2.6.min.js
	lifo_library/add_ons/lightbox-1/js/modernizr.custom.js
	lifo_library/lifo_functions.php
	protextil_library/protextil.js
	protextil_library/query-content.php