Merge origin/master

Conflicts:
	web/contact.html
	web/css/bootstrap.css
	web/css/bootstrap.min.css
	web/css/business-casual.css
	web/index.html
	web/js/bootstrap.js
	web/js/bootstrap.min.js
	web/js/jquery-1.10.2.js
	web/nosotros.html
	web/noticias.html
Merge origin/master

Conflicts:
	web/museos.html