modification on pill lookup
pill lookup search issue
smtp settings configuration
footer customized; select drop-down image changed
Merge branch 'provider_pravin_karan' of github.com:Bharatupgraded/pillphone into provider_pravin_karan
html pages completed except generation report view all
Merge branch 'admin_pradeep' of github.com:Bharatupgraded/pillphone into provider_pravin_karan
sending json for mobiles request if html rendering html
migration regenerated to add_delta_into_provider
modefied generated user report view
Merge branch 'provider_pravin_karan' into admin_pradeep
reverted back to delta true
created new controller under api/contents
script code minimized in admin layout
strength column has been added to add_medication(pilllookup) page; in pill_lookup page, it displays only active drugs
rspec gems removed
medications - pagiantion and search
Merge branch 'provider_pravin_karan' of github.com:Bharatupgraded/pillphone into provider_pravin_karan

Conflicts:
	app/controllers/providers/consumers_controller.rb
	db/sphinx/development/consumer_core.spa
	db/sphinx/development/consumer_core.spd
	db/sphinx/development/consumer_core.sph
	db/sphinx/development/drug_core.spa
	db/sphinx/development/drug_core.spd
	db/sphinx/development/drug_core.sph
	db/sphinx/development/drug_core.spi
	db/sphinx/development/message_core.spa
	db/sphinx/development/message_core.spd
	db/sphinx/development/message_core.sph
	db/sphinx/development/provider_core.spa
	db/sphinx/development/provider_core.spd
	db/sphinx/development/provider_core.sph
provider should not be able to login if provider_role is nil; footer is hardcoded for now; forgot password page not showing error messages
title added for each pages