Service and receiver shell with alarm managers
Service shell with receivers
Merge branch 'Notifications'
Implementet matching algorithm

added static today() method to da, wich returns a day object of this
day;
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team6

Conflicts:
	src/MensaUniBe/src/com/ese2013/mub/FavoriteButtonListener.java
Merge remote-tracking branch 'upstream/master'
added layout and rewrote servise with Criteria Object
Criteria object n stuff
new changes is service behavior, problem with serviece is null and layout
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team6
addet TestCase for Criteria matcher
Merge branch 'master' of https://github.com/countschokula/ese2013-team6
still nullpointer,working layout
Merge branch 'master' of https://github.com/countschokula/ese2013-team6
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team6

Conflicts:
	src/MensaUniBe/src/com/ese2013/mub/DrawerMenuActivity.java
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team6

Conflicts:
	src/MensaUniBe/src/com/ese2013/mub/DrawerMenuActivity.java
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team6
changed notificationhandler to fit Preferences
Merge branch 'master' of https://github.com/countschokula/ese2013-team6

Conflicts:
	src/MensaUniBe/src/com/ese2013/mub/DrawerMenuActivity.java
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team6