Merge branch 'master' of https://github.com/teamspaceferret/repository.git
Merge origin/master
Merge origin/master
Added gradle build file