j2ee
Merge branch 'master' of https://github.com/Wirwing/Sharepoint

Conflicts:
	SharepointJspProject/WebContent/user_profile.jsp
	SharepointJspProject/resources/struts.xml
Merge branch