fix
fix
Merge branch 'master' of github.com:Ferioney/nc_social_library

Conflicts:
	Social_Library/Social_Library-war/web/WEB-INF/web.xml