gradle version update
Merge branch 'kristof_crouton'