layout part friends, not complete
:wq
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2013-team6

Conflicts:
	src/MensaUniBe/res/values/strings.xml

:wq