Tweaking date validation
Merge branch 'develop'