Date handling
Merge branch 'master' of https://github.com/socrex/front-socrex