aa
Merge branch 'master' of https://github.com/maddemon/SparrowCMS

Conflicts:
	src/SparrowCMS.Base/Context.cs
update