update stuff
Merge branch 'gradle'