Merge branch 'testing' of https://github.com/priyanka-techmaes/kisanfarms into develop
resolved bugs
resolved bugs
resolved conflicts
resolved consolge log
Merge pull request #150 from priyanka-techmaes/resolved-bugs-develop

Resolved bugs develop