drugs and dispensaries dao
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/src/main/java/ru/yandex/hackaton/server/resources/DistrictsResource.java
Merge remote-tracking branch 'origin/master'
dao and search request added
Merge remote-tracking branch 'origin/master'