Cambios en user_profile_bussiness y relacionados
Merge branch 'master' of https://github.com/Wirwing/Sharepoint

Conflicts:
	SharepointJspProject/resources/struts.xml
Se resuelven conflictos.