Merge do código do branch para o trunk

git-svn-id: http://svn.brlight.net/svn/lightbase-neo/trunk/LBApp@1234 29b92fdf-8c97-4584-b987-84e8d3c556fa
Merge branch 'master', remote branch 'git-svn'