cambios 08/12/2014
Merge remote-tracking branch 'origin/master'

Conflicts:

	negosys/src/main/java/ec/com/redepronik/negosys/invfac/service/BodegaServiceImpl.java

	negosys/src/main/java/ec/com/redepronik/negosys/invfac/service/KardexServiceImpl.java