Merge pull request #21 from chanunc/master

Fixed: CVB-105: NaN value show on Date & Time when edit booking