test
Merge remote-tracking branch 'origin/master'

Conflicts:
	TrainingPlanner/Views/Home/DodajTrening.cshtml