backendless
Merge branch 'master' of https://github.com/gpelaez/Proyecto-Cruso-Android

Conflicts:
	Rockola/.classpath
	Rockola/project.properties