Ts   1/2014

Resquest de merge respectiva as alteracoes ate o dia 20/05