#mg-79 state: in progress work: 2m 30m
Merge branch 'develop' of https://github.com/KernelCorp/mygenetics into develop

Conflicts:
	app/views/user/worksheets/edit.html.slim