Merge from judf

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