Merge 2
Merge branch 'master' of https://github.com/hmjavier/pruebaMerge.git

Conflicts:
	merge/WebContent/page.jsp