Settings with dynamic notification list
Merge branch 'master'

Conflicts:
	src/MensaUniBe/res/layout/fragment_settings.xml
	src/MensaUniBe/src/com/ese2013/mub/SettingsFragment.java
Friends request, deleting, accepting and declining is working
menu layout for creating a new invitation
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team6
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team6