Merge branch 'master' of https://github.com/Androxyde/Flashtool.git
Merge branch 'master' of https://github.com/Androxyde/Flashtool.git