Correcoes finais
Merge branch 'release/20141031_01'