Changes made by Felipe Hanashiro (felipe.hanashiro@exla.com.br).
Changes made by Felipe Hanashiro (felipe.hanashiro@exla.com.br).
Merge branch 'master' of https://github.com/hanashiro/mgControle.git

Conflicts:
	mg_Controle/scripts/Plugins/ChildBrowser.js
Changes made by Felipe Hanashiro (felipe.hanashiro@exla.com.br).