Included the libraries needed for the date picker
Merge origin/master