fix datepicker
fix conflict
merge master to simon