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

Conflicts:
	Social_Library/Social_Library-war/src/java/sociallibrary/dao/DaoConnection.java
Connection pool fix
Merge branch 'master' of github.com:Ferioney/nc_social_library