Changing
Merge remote-tracking branch 'origin/master'

Conflicts:
	BusDriver/res/layout/activity_main.xml
	BusDriver/res/layout/activity_menu_administrativo.xml
	BusDriver/res/layout/activity_modo_coleta.xml
	BusDriver/res/values/strings.xml
	BusDriver/src/br/peoplebus/busdriver/activity/MainActivity.java
	BusDriver/src/br/peoplebus/busdriver/activity/MenuAdministrativoActivity.java
	BusDriver/src/br/peoplebus/busdriver/activity/ModoColetaActivity.java
	BusDriver/src/br/peoplebus/busdriver/model/LocalStorage.java