Merge pull request #78 from vaibhavcisin274/vaibhav

remove show and back link form client page edit #vaibhav
importfile #ajay
conflict #ajay
working on group-tax
remove conflicts 6-july
changes in layout
Merge pull request #81 from vaibhavcisin274/ajay

Ajay
Merge pull request #82 from vaibhavcisin274/sivanand

changes in layout
remove conflicts 8-jul
rename again
Merge pull request #84 from vaibhavcisin274/anshul

Anshul
Merge pull request #85 from vaibhavcisin274/sivanand

rename again