Added fix to set the current date in date field appropriately
Added fix for review comment
Merge pull request #363 from PrimeRevenue/defect/today_date_fix

Ready to review and merge