f
f
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/web/WEB-INF/classes/bean/DocumentosBean.class
	build/web/menu_admin.xhtml
	nbproject/private/private.xml
	web/menu_admin.xhtml