Merge branch 'develop' of https://github.com/priyanka-techmaes/kisanfarms into product-detail-page
removed code line from to controller.js
done product detail page
Merge branch 'develop' of https://github.com/priyanka-techmaes/kisanfarms into product-detail-page
done product page
Done with changes search pop up
Done with changes forgot password popup
Done with changes forgot password popup
Merge pull request #116 from priyanka-techmaes/all-vegetables

All vegetables
Merge pull request #117 from priyanka-techmaes/product-detail-page

Product detail page
Removed conflicts in checkout.css file
Merge branch 'develop' of https://github.com/priyanka-techmaes/kisanfarms into order-page