modefied generic name to drug_name_short in drug_test.rb
Merge branch 'admin_pradeep'
Merge branch 'provider_pravin_karan' of github.com:Bharatupgraded/pillphone
drug is_active is changed from true to 1
Merge branch 'admin_pradeep'
strength with truncate
Merge branch 'master' of github.com:Bharatupgraded/pillphone into provider_pravin_karan
assert @provider.valid? into provider_test.rb