removed mapping files for events and rooms
Merge remote-tracking branch 'origin/master'
minor fixes and improvements