done with validations
Merge branch 'develop' of github.com:nishant-shrivastava/re-locate into develop