sync adds
Merge branch 'master' of https://github.com/Genuitec/qr-conference-app