Configurando para novo android
Merge branch 'master' of https://github.com/watter/titanium
Merge branch 'master' of https://github.com/watter/titanium

Conflicts:
	Final de Curso/CeleparFDC/tiapp.xml