Add friends from phone book
nothing important
Merging

Conflicts:

Code/ShoppingList/src/ch/unibe/ese/shopnote/activities/CreateItemActivit
y.java

Code/ShoppingList/src/ch/unibe/ese/shopnote/activities/ManageFriendsActi
vity.java

Code/ShoppingList/src/ch/unibe/ese/shopnote/activities/ShareListActivity
.java

Code/ShoppingList/src/ch/unibe/ese/shopnote/activities/ViewListActivity.
java