Merge branch 'api-hardik' into apis_by_biju
Merge branch 'apis_by_biju' of https://github.com/Bharatupgraded/pillphone into apis_by_biju
fixed reminders for drug model
Fix - consumer_custom_drug - renamed drug_name_long
Updated schema
Merge branch 'api-hardik' into apis_by_biju
consumer_medication fix + comments added
care_givers, dosage_diary, drugs controller comment defined
added validation on consumer_medication
cron-setup
whenever gem added
merged api-hardik
added time_xone field to consumer_settings
added mailer configs and test emailer
added update reminders routes
Merge branch 'api-hardik' into apis_by_biju
side kiq implementation
Merge branch 'apis_by_biju' of https://github.com/Bharatupgraded/pillphone into apis_by_biju

Conflicts:
	config/routes.rb
reviewed update reminder
device_type added to consumers