added pharmacy

detals
Merge branch 'master' of https://github.com/twalipo/DVS

Conflicts:
	.idea/workspace.xml