Added datepicker and changed selecting
no change
Merge branch 'lukasDev' into dev