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

Conflicts:
	gen/com/psm/farmacy/R.java
	res/layout/activity_medicine.xml
	src/com/psm/SqLite/FarmacyDataBase.java
	src/com/psm/farmacy/MedicineActivity.java