changes in oven_layout.xml
changes in oven_layout.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/dk/summerinnovationweek/futurehousing/fragment/RoomFragment.java