work with DAO
override trouble
Merge branch 'DAOdev'

Conflicts:
	Social_Library/Social_Library-war/src/java/OracleDAO/OracleUsersDAO.java
	Social_Library/Social_Library-war/src/java/controller/ScoreCommand.java
	Social_Library/Social_Library-war/src/java/model/registration/Registration.java