:made date picker on expense form hidden
:Resolved conflicts