- Obteniendo conexión desde dataSource
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/main/java/co/qcsc/spatha/web/servlet/ReportServlet.java
Merge branch 'master' of https://github.com/jgromeros/spatha.git