z
OK
Merge branch 'master' of https://github.com/mroland/VarjaoClipping.git

Conflicts:
	src/br/com/varjaoclipping/dao/SecaoDAO.java
	src/br/com/varjaoclipping/model/Secao.java