Merge pull request #396 from vaibhavcisin274/vaibhav

couflicts resolve invoice/recurring show 18-sep
inventory control 19-sep
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project into vaibhav