#1: Room edit
#2: adding limit to list rooms dao method
Merge branch 'master' into client-side