Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team6
Merge branch 'master' of https://github.com/countschokula/ese2013-team6
Merge branch 'master' of https://github.com/countschokula/ese2013-team6
ratingBar shell in MenuView
Now using the id from parse.com as id for menus, added stub for menurating upload in menumanager
Merge pull request #11 from dvicini/master

Now using the id from parse.com as id for menus, added stub for menurati...
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team6

Conflicts:
	src/MensaUniBe/src/com/ese2013/mub/DrawerMenuActivity.java
Settings layout
Completed Settings
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