Updated restaurant and cuisine types
Merge branch 'master' into backend
Removed conflicts in merge

Conflicts:
	TimePlanner/JavaSource/de/tuberlin/hdis14/cinema/test.java
	TimePlanner/JavaSource/de/tuberlin/hdis14/core/test.java