#mg-79 state: fixed work: 6h added pdf template, improvments in edit worksheet
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/controllers/user/worksheets_controller.rb