Merge pull request #253 from vaibhavcisin274/poonam

Poonam
all module create association #29-july
conflict remove
Merge pull request #254 from vaibhavcisin274/vaibhav

Vaibhav
remove conflicts