- code cleaning
- typo
- changes connected to gradle 2.1