Merge remote-tracking branch 'origin/master'

Conflicts:
	PROJECT_BASE/ProjectBaseCORE/.classpath
	PROJECT_BASE/ProjectBaseCORE/src/appContext-ProjectBase.xml
	PROJECT_BASE/ProjectBaseDAO/.classpath
	PROJECT_BASE/ProjectBaseDAO/.project
	PROJECT_BASE/ProjectBaseDAO/.settings/org.eclipse.jdt.core.prefs
	PROJECT_BASE/ProjectBaseDAO/src/appContext-ProjectBaseDAO.xml
	PROJECT_BASE/ProjectBaseWEB/.classpath
	PROJECT_BASE/ProjectBaseWEB/.project
	PROJECT_BASE/ProjectBaseWEB/.settings/org.eclipse.wst.common.component
	PROJECT_BASE/ProjectBaseWEB/WebContent/WEB-INF/spring/appServlet/servlet-context.xml
	PROJECT_BASE/ProjectBaseWEB/WebContent/WEB-INF/views/inicio.jsp
	PROJECT_BASE/ProjectBaseWEB/build/classes/com/projectbase/web/controller/InicioController.class
	PROJECT_BASE/ProjectBaseWEB/src/com/projectbase/web/controller/InicioController.java
Ajuste
Merge branch 'master' of https://github.com/candres0819/spring

Conflicts:
	PROJECT_BASE/ProjectBaseCORE/.classpath
	PROJECT_BASE/ProjectBaseDAO/.classpath
	PROJECT_BASE/ProjectBaseWEB/.classpath
	PROJECT_BASE/ProjectBaseWEB/build/classes/com/projectbase/web/controller/InicioController.class