Merge branch 'master' of github.com:sergiorf/ifg

Conflicts:
	doc/Arquitetura de Software.doc
	doc/parecerista.dia
	doc/users.dia
	doc/users3.dia
Merge branch 'master' of github.com:sergiorf/ifg

Conflicts:
	doc/Arquitetura de Software.doc
	doc/parecerista.dia
	doc/users.dia
	doc/users3.dia