Splash
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	src/br/com/bizu/telas/TelaPrincipalActivity.java