work on group tax
remove conflicts 5-jul
Merge pull request #68 from vaibhavcisin274/vaibhav

Vaibhav
again remove conflicts 5-jul
Merge pull request #69 from vaibhavcisin274/anshul

Anshul
change button position #vaibhav