no message
Merge branch 'master' into Dev

Conflicts:
	InfiniteScroll/Views/Home/Index.cshtml