Merge branch 'master' of https://github.com/barbanero/Juguete

Conflicts:
	Juguete/build.gradle