Merge remote-tracking branch 'upstream/development'
update datepicker
Merge pull request #48 from diaarezz/master

update datepicker