Minor fixes
Merge branch 'master' of https://github.com/interactive-events/android-app
Beacon checkin fix
Small merge fix