Merge remote-tracking branch 'origin/master'

Conflicts:
	Hoanglanphotomedia.Web/Hoanglanphotomedia.Web.v12.suo
	Hoanglanphotomedia.Web/Hoanglanphotomedia.Web/Views/Home/Index.cshtml