Merge branch 'develop' of https://github.com/priyanka-techmaes/kisanfarms into develop-10
resolved bugs
Merge branch 'develop' of https://github.com/priyanka-techmaes/kisanfarms into develop-10
remove soon in files
remove span
Merge pull request #195 from priyanka-techmaes/develop-10

Develop 10