Upgrade gradle version to 2.1