sqlite pruebas
Merge branch 'master' of https://github.com/PSMoviles/Farmacy

Conflicts:
	gen/com/psm/farmacy/R.java