2.1
Merge branch 'master' of https://github.com/NBNG/siroc

Conflicts:
	SIROC/src/br/com/siroc/dao/ProdutoDAO.java