date picker updates and trip count div;
resolve merge conflict;
remove orig files;
Merge pull request #1 from larktravel/el_wip

El wip