Edit Report and Fix RoomDaoImpl
Merge branch 'EditReport'