using bullet and datepicker
merge master