Improving the article evaluation functionality.
	modified:   src/br/ufrn/dimap/pubshare/activity/PubshareActivity.java
	modified:   src/br/ufrn/dimap/pubshare/evaluation/ArticleDetailActivity.java
	modified:   src/br/ufrn/dimap/pubshare/evaluation/ArticleEvaluationActivity.java
	modified:   src/br/ufrn/dimap/pubshare/mocks/UserMockFactory.java
	deleted:    src/br/ufrn/dimap/pubshare/restclient/SaveEvaluationRestClient.java
Merge http://github.com/danielcalencar/pubshare
removing R.java once again
	deleted:    gen/br/ufrn/dimap/pubshare/activity/R.java
Merge pull request #37 from danielalencar/master

 Improving the article evaluation functionality
Merge branch 'master' of http://github.com/judf/pubshare into merge-resolver

Conflicts:
	gen/br/ufrn/dimap/pubshare/activity/R.java
	src/br/ufrn/dimap/pubshare/mocks/UserMockFactory.java

	modified:   AndroidManifest.xml
	modified:   res/layout/activity_edit_profile.xml
	modified:   res/layout/activity_register.xml
	modified:   res/layout/activity_search_people.xml
	modified:   res/layout/row_friends_list.xml
	modified:   res/layout/row_listview_people_list.xml
	new file:   res/layout/tags.xml
	modified:   res/values/strings.xml
	modified:   src/br/ufrn/dimap/pubshare/activity/LoginActivity.java
	modified:   src/br/ufrn/dimap/pubshare/activity/RegisterActivity.java
	modified:   src/br/ufrn/dimap/pubshare/activity/SearchPeopleActivity.java
	modified:   src/br/ufrn/dimap/pubshare/activity/ShowFriendsActivity.java
	modified:   src/br/ufrn/dimap/pubshare/adapters/FriendsListAdapter.java
	modified:   src/br/ufrn/dimap/pubshare/adapters/UserListAdapter.java
	modified:   src/br/ufrn/dimap/pubshare/domain/Profile.java
	modified:   src/br/ufrn/dimap/pubshare/domain/User.java
	modified:   src/br/ufrn/dimap/pubshare/mocks/UserMockFactory.java
	new file:   src/br/ufrn/dimap/pubshare/restclient/SaveUserRestClient.java
	new file:   src/br/ufrn/dimap/pubshare/restclient/results/UserResult.java
	modified:   src/br/ufrn/dimap/pubshare/util/Constants.java
Merge pull request #38 from danielalencar/master

Merge from judf
Implementing the User communication to server.
	modified:   src/br/ufrn/dimap/pubshare/activity/RegisterActivity.java
	modified:   src/br/ufrn/dimap/pubshare/adapters/FriendsListAdapter.java
        new file:   src/br/ufrn/dimap/pubshare/domain/Friend.java
	new file:   src/br/ufrn/dimap/pubshare/domain/Tag.java
	modified:   src/br/ufrn/dimap/pubshare/domain/User.java
	modified:   src/br/ufrn/dimap/pubshare/mocks/UserMockFactory.java
	deleted:    src/br/ufrn/dimap/pubshare/restclient/SaveUserRestClient.java
Merge pull request #39 from danielalencar/master

Implementing the User communication with the server
- Improving the async method from RegisterActivity.java
- Adding some mocks with id in UserMockFactory.java
	modified:   src/br/ufrn/dimap/pubshare/activity/RegisterActivity.java
	modified:   src/br/ufrn/dimap/pubshare/mocks/UserMockFactory.java
Merge pull request #40 from danielalencar/master

User logic
Improving Evaluation logic in client

	modified:   res/layout/activity_article_evaluation.xml
	modified:   res/values/strings.xml
	modified:   src/br/ufrn/dimap/pubshare/activity/PubnotesActivity.java
	modified:   src/br/ufrn/dimap/pubshare/evaluation/ArticleDetailActivity.java
	modified:   src/br/ufrn/dimap/pubshare/evaluation/ArticleEvaluationActivity.java
	modified:   src/br/ufrn/dimap/pubshare/evaluation/EvaluationListAdapter.java
	modified:   src/br/ufrn/dimap/pubshare/util/Constants.java
Merge pull request #46 from danielalencar/master

Evaluation - Client
Setando current user em LoginAcitivity, adicionando comunicação com servidor na exibição de profile e na edição.
Merge branch 'master' of https://github.com/danielcalencar/pubshare