Fix script
Merge commit '88565d29ddf23b0e438947902bb14ccf7d21c65a'
Merge branch 'master' of https://github.com/MirakelX/mirakel-android
Merge branch 'master' of https://github.com/MirakelX/mirakel-android
Move travis.yml to the rigth place