Done by ankit
Merge branch 'master' of https://github.com/BelEspiritTech/view_V2.0