consumer_medication fix + comments added
care_givers, dosage_diary, drugs controller comment defined
side kiq implementation
Merge branch 'apis_by_biju' of https://github.com/Bharatupgraded/pillphone into apis_by_biju

Conflicts:
	config/routes.rb
device_type added to consumers
Merge branch 'master' of https://github.com/Bharatupgraded/pillphone
Merge branch 'apis_by_biju' of https://github.com/Bharatupgraded/pillphone into apis_by_biju
Merge branch 'master' into apis_by_biju

Conflicts:
	app/controllers/api/medications_controller.rb