zfz
Merge branch 'master' of https://github.com/BloodyCristal/WebAgenda.git
jdtyj
Merge branch 'master' of https://github.com/BloodyCristal/WebAgenda.git

Conflicts:
	WebAgenda/WebContent/WEB-INF/web.xml