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

Signed-off-by: Viktor Zherdev <vrzherdev@gmail.com>
Merge branch 'master' of http://www.github.com/windsider/conference-hall-reservation