updated to resolve the conflicts
Merge branch 'master' of https://github.com/sujaydavalgi/AndroidScripts

Conflicts:
	OdieTool.sh