Changes merged from ISIS development branch.
Merge branch 'develop' of https://github.com/wasabii/Cogito into cogito_develop

Conflicts:
	Cogito.Web.UI/ControlCollectionExtensions.cs
	Cogito.Web.UI/ControlExtensions.cs
	Cogito.Web.UI/ResourceManager.cs
	Cogito.Web.UI/Resources/ScriptResourceControl.cs
	Cogito.Web.UI/Resources/ScriptResourceInstaller.cs
	Cogito.Web.UI/Resources/StylesheetManager.cs
	Cogito.Web/Resources/ResourceModule.cs
Minor.