merge fix
setupHockeyAppWithLiveID:betaID and change constants