Deilan - Modificacion Historial
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/machosoftware/proyectopos/PosBaseDatos.java
Merge pull request #5 from MachoSoftware/master

Araya-GetItemsDB