The demo app and the library have been splitted into different repositories.
Solving conflicts