Commit parcial
Commit parcial para integracion
Merge branch 'integration' of https://github.com/salej1/blackstar-dev into integration

Conflicts:
	blackstarWeb/WebContent/AirCoService.jsp
	blackstarWeb/WebContent/WEB-INF/ctx/dao-context.xml