custom setters
Merge branch 'datepickerStyle' into merging
Merge branch 'merging' into Dev3