date picker bugs
merge
merge
merge
fixed email