Initial configuration
resolving conflicts.

Conflicts:
	src/main/java/br/ufrn/dimap/pubnote/domain/User.java
	src/main/resources/hibernate.cfg.xml
Merge branch 'master' of https://github.com/danielcalencar/pubnotes-server
Merge branch 'master' of https://github.com/danielcalencar/pubnotes-server
Merge branch 'master' of https://github.com/danielcalencar/pubnotes-server
Inserindo DAOs e metodo save().
Versao com DAOs do usuario, profile, serviço que salva usuario no BD.
Merge branch 'master' of https://github.com/danielcalencar/pubnotes-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 …