fixed bug with date in safari and firefox
fixed bug with date in safari and firefox
Merged master fixed conflict