Merge branch 'muriloBranch'

Conflicts:
AutoPI-ejb/nbproject/private/private.properties
AutoPI-ejb/nbproject/private/private.xml
AutoPI-ejb/src/java/sp/senac/autopi/entidades/Pedido.java
AutoPI-war/nbproject/private/private.properties
AutoPI-war/nbproject/private/private.xml
nbproject/private/private.properties