API change
API change observed
Conflict resolution: Used master main.cpp
Callbacks are now ordered.
Merge branch 'master' into input-management