Settings with dynamic notification list
Merge branch 'master'

Conflicts:
	src/MensaUniBe/res/layout/fragment_settings.xml
	src/MensaUniBe/src/com/ese2013/mub/SettingsFragment.java