Merge branch 'master' of github.com:myusoof/Gebhish-Yusoof

Conflicts:
 Gradleexample/build.gradle