#mg-79 state: in progress work: 6h edit page and show page. Have some problem
Merge remote-tracking branch 'origin/develop' into develop

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