date arrangement to fit in
Merge branch 'dev'