update
Merge remote-tracking branch 'origin/master'

Conflicts:
	FulaDjur/Views/Home/Index.cshtml