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

Conflicts:
	project.properties
	src/com/psm/SqLite/FarmacyDataBase.java
	src/com/psm/SqLite/SQLiteHelper.java