Merge branch 'master' of github.com:Androguide/Pimp_my_Z1