Modifying the transaction strategy from server
Correcting EvaluationService
Criado UserDAO
refining DAOs and refining EvaluationService
refining EvaluationService
Merge pull request #11 from danielalencar/master

Refining Evaluation Service
Improving the conversion of EvaluationEntity to Evaluation, in order to avoid
NullPointerException.
	modified:   src/main/java/br/ufrn/dimap/pubnote/domain/EvaluationEntity.java
Merge pull request #12 from danielalencar/master

Evaluations on server
Merge http://github.com/judf/pubnotes-server into merge-resolver

Conflicts:
	src/main/java/br/ufrn/dimap/pubnote/dao/UserDAO.java
	src/main/java/br/ufrn/dimap/pubnote/dao/UserDAOFactory.java

	modified:   .classpath
	modified:   .settings/org.eclipse.jdt.core.prefs
	new file:   src/main/java/br/ufrn/dimap/pubnote/dao/ProfileDAO.java
	new file:   src/main/java/br/ufrn/dimap/pubnote/dao/ProfileFactory.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/dao/UserDAO.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/dao/UserDAOFactory.java
	new file:   src/main/java/br/ufrn/dimap/pubnote/domain/Profile.java
	new file:   src/main/java/br/ufrn/dimap/pubnote/domain/ProfileEntity.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/domain/User.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/domain/UserEntity.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/ws/UserService.java
	modified:   src/main/resources/hibernate.cfg.xml
Starting to implement the logic user on the server-side
	modified:   src/main/java/br/ufrn/dimap/pubnote/domain/Article.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/domain/Evaluation.java
	new file:   src/main/java/br/ufrn/dimap/pubnote/domain/Friend.java
	new file:   src/main/java/br/ufrn/dimap/pubnote/domain/FriendEntity.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/domain/Profile.java
	new file:   src/main/java/br/ufrn/dimap/pubnote/domain/Tag.java
	new file:   src/main/java/br/ufrn/dimap/pubnote/domain/TagEntity.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/domain/User.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/domain/UserEntity.java
	modified:   src/main/resources/hibernate.cfg.xml
Merge pull request #13 from danielalencar/master

Starting to implement the User logic user on the server-side …
Improving Hibernate mapping in ArticleEntity.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/domain/ArticleEntity.java
Merge pull request #14 from danielalencar/master

Improving Hibernate mapping in ArticleEntity.java
Improving EvaluationService Implementation
	modified:   src/main/java/br/ufrn/dimap/pubnote/dao/ArticleDAO.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/dao/DAO.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/dao/EvaluationDAO.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/dao/ProfileDAO.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/dao/UserDAO.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/ws/EvaluationService.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/ws/UserService.java
	modified:   src/main/resources/hibernate.cfg.xml
Merge pull request #15 from danielalencar/master

 Improving EvaluationService Implementation
Improving the evaluation implementation in server
	modified:   src/main/java/br/ufrn/dimap/pubnote/dao/EvaluationDAO.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/domain/EvaluationEntity.java
	modified:   src/main/java/br/ufrn/dimap/pubnote/ws/EvaluationService.java
Merge pull request #16 from danielalencar/master

Evaluation - server side
Adicionando serviços de autenticação e recuperação de profile.
Merge branch 'master' of https://github.com/danielcalencar/pubnotes-server