App icon next to Friend, if he has the app
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team8

Conflicts:
	Code/ShoppingList/src/ch/unibe/ese/shopnote/core/BaseActivity.java