small refactoring; fixed event that created on day click
fixed room id on generated on event create
Merge remote-tracking branch 'origin/master'