fridaydate 1012014 I changed apis by bijju file
conflict coming from master
gemfile.lock
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone into bharatdrugimage
drugimage file is now returning image url
rmagic removed from vendor/bundle/ruby/2.0.0/bundler/gems/rmagick-79e1708c7f67
Revert "drugimage file is now returning image url"

This reverts commit 887584157297a1e7c907665ab85a68bda2904175.
Drugimage is now working fine
drug_image uploaded is added
drugimage file is now working
drugimage modified
change to short_name drugs
change column name - drug_name_short
rspec gem file is deleted
strength and short name is modified
Merge branch 'admin_pradeep'
Merge branch 'admin_pradeep'
Merge branch 'admin_pradeep'
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone into drugimage

Conflicts:
	Gemfile.lock
	app/controllers/api/drugs_controller.rb
	app/models/consumer.rb
	app/views/api/medications/get_drug_details.json.jbuilder
	config/database.yml
	config/routes.rb
	db/schema.rb
	test/mailers/consumer_mailer_test.rb
	test/test_helper.rb
fixed syntax error