add_my_med change
Merge branch 'provider_pravin_karan' of github.com:Bharatupgraded/pillphone
Merge branch 'provider_pravin_karan'
modifications in admin
Merge branch 'admin_pradeep'
new provider register was not working properly
Merge branch 'master' of github.com:Bharatupgraded/pillphone
modifications in sphinx search provider
fixed drug_name_long to drug_name_short
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone
Merge branch 'admin_pradeep'
added parent_provider_id is nil
Merge branch 'provider_pravin_karan' of github.com:Bharatupgraded/pillphone into provider_pravin_karan
Merge branch 'master' into provider_pravin_karan
validations on provider and provider register html page
Merge branch 'provider_pravin_karan' of github.com:Bharatupgraded/pillphone into provider_pravin_karan
fda_form and drug relationships changed and unneccessory fields has been removed
messages page was crashing due to @templates variables in provider.html.erb layout