Limpieza de themes/bootstrap
Merge branch 'master' of github.com:fawques/CodeSpain

Conflicts:
	themes/bootstrap/views/site/index.php