Merge remote-tracking branch 'origin/jem' into jem
Merge branch 'jem' into gabriel
Fixed Datepicker
Merge branch 'gabriel' into jem
fixed .gitignore