cualquiercosa
test4 ovillMerge branch 'master' of https://github.com/bloodyjoni/SCTyPElaMatanzav5

Conflicts:
	bin/classes/com/elovillo/cytype/HelloCordova.class
	bin/classes/com/elovillo/cytype/MyService.class
	bin/classes/com/elovillo/cytype/R$attr.class
	bin/classes/com/elovillo/cytype/R$drawable.class
	bin/classes/com/elovillo/cytype/R$string.class
	bin/classes/com/elovillo/cytype/R$xml.class
	bin/classes/com/elovillo/cytype/R.class
	gen/com/elovillo/cytype/R.java
Modificacion de hellocordova a SCTYPE
Meta dta added para el google services new lib