Actualizacion Topsat
Merge https://github.com/uialberto/topsatsc

Conflicts:
	.htaccess
	css/style_clientes.css
	css/style_servicios.css
	includes/cargaindex.php
	includes/info_facebook.php
	includes/logo_direccion.php
	includes/menu_principal.php
	includes/pie_pagina.php
	includes/top_clientes.php
	includes/top_index.php
	includes/top_servicios.php
	includes/top_topografia.php
	includes/top_ubicacion.php
	nbproject/private/private.xml
	pages/altimetria.php
	pages/clientes.php
	pages/deslindes.php
	pages/home.php
	pages/mediciones.php
	pages/nuestroequipo.php
	pages/parcelamientos.php
	pages/replanteos.php
	pages/servicios.php
	pages/topografia.php
	pages/ubicacion.php
	pages/urbanizaciones.php