Add zeross and fix firefox date bug
Merge conflictss