#td-9 work 7h
Merge branch 'master' of https://github.com/KernelCorp/team_days

Conflicts:
	app/assets/javascripts/partners/templates/orders/index.emblem
td-9 fixed