minor changes
commit after merging
removed orig after merge
minor changes
started working on the date picker fragment