Merge origin/master

Conflicts:
	src/java/pe/edu/upeu/application/factory/FactoryConnectionDB.java
	src/java/pe/edu/upeu/application/web/controller/Cindex.java
	web/Principal.jsp
	web/js2/index.js
Merge origin/master

Conflicts:
	src/java/pe/edu/upeu/application/factory/FactoryConnectionDB.java
	src/java/pe/edu/upeu/application/web/controller/Cindex.java
	web/Principal.jsp
	web/js2/index.js
Merge origin/master

Conflicts:
	src/java/pe/edu/upeu/application/factory/FactoryConnectionDB.java
	src/java/pe/edu/upeu/application/web/controller/Cindex.java
	web/Principal.jsp
	web/js2/index.js
Merge origin/master

Conflicts:
	src/java/pe/edu/upeu/application/factory/FactoryConnectionDB.java
	src/java/pe/edu/upeu/application/web/controller/Cindex.java
	web/Principal.jsp
	web/js2/index.js
Merge origin/master