merge build
Merge branch 'dev' of https://github.com/Gi972/playerApp.git