merge 3
merge 3.1
Merge branch 'master' of https://github.com/hmjavier/pruebaMerge.git

Conflicts:
	merge/WebContent/page.jsp