Merge conflicts fixed
Remove graddle.properties