Merge branch 'master' of http://www.github.com/windsider/conference-hall-reservation
Merge branch 'master' of http://www.github.com/windsider/conference-hall-reservation