fixed NPE
problems saving date fields
Merge branch 'master' of https://github.com/BasisHub/components