Master gradle

#1 - Manually merged master branch in master-gradle 
    last commit included 234d0fb04f4c4b044ff52cf20ef1ec9497ee2202