Merge pull request #39 from priyanka-techmaes/develop

Develop
Merge pull request #40 from priyanka-techmaes/develop

Develop
Merge pull request #41 from priyanka-techmaes/develop

resolved error of form
resolved bug
Merge pull request #42 from priyanka-techmaes/cart-dropdown

Done cart drop-down functionality in cart popup
Resolving conflicts from cart.php
Merge pull request #44 from priyanka-techmaes/develop

Develop
Merge pull request #45 from priyanka-techmaes/develop

remove alert in files
Merge branch 'develop' into testing
Merge pull request #46 from priyanka-techmaes/develop

Develop
Merge pull request #47 from priyanka-techmaes/develop

Develop
Merge pull request #48 from priyanka-techmaes/develop

Develop
Merge pull request #50 from priyanka-techmaes/develop

Develop
done add location
resolved conflicts in files
removed static address in contact us page
done change password
Merge branch 'forget-password' of https://github.com/priyanka-techmaes/kisanfarms into forgotPassword
done forget password send mail
resolved bug