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

Conflicts:
	Social_Library/Social_Library-war/web/WEB-INF/web.xml
new auth connected