- added the shimmer library to git
- removed and fix the drivers
Merge branch 'master' into android-app-dev
Starting to prepare the merge with the master branch.