Changes made by Andre Schneider (andre.schneider@coloratur.com).
Merge branch 'master' of https://github.com/coloratur/brasil2014.git