Updated, added date picker, JS still not working.
Merge branch 'Date-picker'
Fixed JS Problems
Merge branch 'Date-picker'