fixed event stream to deal with locks properly
Changed BoxEvent.getId() to return the BoxEvent's event_id (since Box Event has no 'id' field
Merge branch 'master' of github.com:box/box-java-sdk-v2 into fp