#mg-68 state: in progress work: 1h 50m
#mg-68 state: in progress work: 2h 20m
#mg-68 state: in progress work: 50m
#mg-68 state: in progress work: 1h 50m
Merge branch 'develop' of https://github.com/KernelCorp/mygenetics into develop

Conflicts:
	app/controllers/user/worksheets_controller.rb
	app/views/user/worksheets/edit.html.slim
	features/step_definitions/research_steps.rb
Rename hook current_user to current_client
#mg-68 state: fixed work: 1h 20m Back-end for client private office
Merge remote-tracking branch 'origin/develop' into develop