Merge branch 'master' of https://github.com/jugchennai/agorava-empireavenue
Code refractoring