Various updates

- dependencies
- gradle 2.1