Compliance pdf download fixed
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone
Compliance pdf download fixed
Compliance pdf download fixed
Added Reminder_Id
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone
added more attributes to consumer json
fixef typo
added last_signed_in_at column in consumers table
dumped current db structure to schema
added try for schedule_reminder id
added language english and french
Merge branch 'admin_pradeep'

Conflicts:
	app/assets/themes/admin/css/style.css
	app/controllers/admin/content_management_controller.rb
	app/helpers/application_helper.rb
	app/views/admin/content_management/about_us.html.erb
	app/views/admin/content_management/credits.html.erb
	app/views/admin/content_management/terms_of_use.html.erb
	app/views/api/care_givers/add_care_giver.json.jbuilder
	db/schema.rb
added usermailer in api/care_giver
Merge branch 'admin_pradeep'
conflicts with admin