better handling of player media
updated zxing
Merge branch 'develop' of https://github.com/ARISGames/iOSClient into develop