test
Fix dao by Nastya
Merge branch 'master' of github.com:Ferioney/nc_social_library

Conflicts:
	Social_Library/Social_Library-ejb/src/java/sociallibrary/dao/DAO.java
	Social_Library/Social_Library-ejb/src/java/sociallibrary/daoimpl/DAOImpl.java