QA changes
Merge branch 'master' of github.com:meurio/tribunais2