fix bug calendar, parent required
Merge branch 'master' of https://github.com/odom/room-management-system