Updated with latest version of Portal and Chaoslib
Removed old solr manager and replaced with Views
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	.gitignore
	lib/Portal.dll
	src/app/CHAOS.Portal.Core.HttpModule/PortalHttpModule.cs