teste pull
Merge branch 'master' of https://github.com/dextra/dextragiarios_2014

alteracoes no calculo do preco das tarifas
Modificacoes em Tarifa