No se que hace aqui
Merge branch 'master' of https://github.com/Wirwing/Sharepoint

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