Conexion ODBC Socios en A2
Merge branch 'master' of https://github.com/xapiz/COCASJOL

Conflicts:
	COCASJOL/COCASJOL.WEBSITE/App_Data/log4net.db