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

Conflicts:
	Social_Library/Social_Library-war/src/java/sociallibrary/dao/LibraryDaoImpl.java
some fixes