Merge branch 'master' of https://github.com/Bharatupgraded/pillphone
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone
Merge branch 'provider_pravin_karan' of https://github.com/Bharatupgraded/pillphone into admin_pradeep
WIP fixing test cases
WIP fixing test cases
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone
WIP fixing test cases
fixing test cases WIP
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone
drug_details changes includes:
1) strength
2) drug_image
3) contra
4) short name
untracked file ignored
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone
removing sphinx from version control
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone

Conflicts:
	db/sphinx/test/provider_delta.spa
	db/sphinx/test/provider_delta.spd
	db/sphinx/test/provider_delta.sph
	db/sphinx/test/provider_delta.spi
	db/sphinx/test/provider_delta.spp
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone
added static assets config
drug_image url is added
added static assets config