finished dateFormatter
Merge branch 'feature/DateFormatter' into develop