Merge pull request #343 from vaibhavcisin274/vaibhav

Vaibhav
push on final
remove conflits
Merge pull request #344 from vaibhavcisin274/anshul

Anshul
eamsi
changes tax module and development #2-sep