bug fix
conflict resolvec
user dash board view changes
task bug resolved
Merge pull request #764 from makfire/mongokit

userdashboard view changes