Merge branch 'Acta' of https://github.com/diego1982chile/app_custodia into ws

Conflicts:
	app/src/main/java/test3/ncxchile/cl/home/ThreadAcciones.java
	app/src/main/java/test3/ncxchile/cl/home/ThreadTareas.java
algunas correcciones
Merge branch 'ws' into Acta2

Conflicts:
	app/src/main/java/test3/ncxchile/cl/home/ThreadAcciones.java
	app/src/main/java/test3/ncxchile/cl/home/ThreadTareas.java
	app/src/main/java/test3/ncxchile/cl/soap/SoapAction.java
Algunas correcciones
Se agrega soporte para GoogleMaps
ultimos cambios
Merge branch 'Acta2' of https://github.com/diego1982chile/app_custodia into Acta2
Se implementa ActaJson2DB
un poco mas..
Merge branch 'Acta' of https://github.com/diego1982chile/app_custodia into Acta2

Conflicts:
	DaoGenerator/build/libs/DaoGenerator.jar
	app/src/main/java/test3/ncxchile/cl/home/HomeActivity.java
	app/src/main/java/test3/ncxchile/cl/home/ThreadAcciones.java
	app/src/main/java/test3/ncxchile/cl/soap/SoapAction.java
	app/src/main/res/layout/grua_dialog.xml
	local.properties
Merge branch 'Acta2' of https://github.com/diego1982chile/app_custodia into Acta2

Conflicts:
	app/src/main/java/test3/ncxchile/cl/login/LoginActivity.java
	app/src/main/java/test3/ncxchile/cl/login/LoginController.java