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

Conflicts:
	app/assets/javascripts/partners/templates/_navigation.hbs
	db/seeds.rb
#td-9 fixed work 3h
Merge remote-tracking branch 'origin/master'