correcoes
alteracoes
Merge branch 'master' of https://github.com/RubensBR/ProjetoLP3
Merge branch 'master' of https://github.com/RubensBR/ProjetoLP3
atualizacoes
Merge branch 'master' of https://github.com/RubensBR/ProjetoLP3

Conflicts:
	BusaoJP/project.properties
	BusaoJP/res/layout/rotas.xml
	BusaoJP/src/br/com/busaojp/RotasActivity.java
	BusaoJP/src/br/com/busaojp/onibus/OnibusDAOJSON.java
resolucao de conflitos + atualizacoes