Ny home
Merge remote-tracking branch 'origin/master'

Conflicts:
	Community/Community/Controllers/HomeController.cs