taking pull
conflict resolved
sdk updated
Merge branch 'master' of https://github.com/mohitchauhan/ElectIndia