up
Merge branch 'master' of https://github.com/Bruuu/diploma

Conflicts:
	app/views/sprints/show.html.slim
	app/views/tasks/_form.html.slim