bef merge
before commit
calender added
added dayactivity and styles to edittext