cambios de nombre

Signed-off-by: gnu <gnu@localhost>
Merge branch 'master' of https://github.com/gsys02/sys02

Conflicts:
	build.gradle

Signed-off-by: gnu <gnu@localhost>