Merge branch 'master' of https://github.com/amos402/blog

Conflicts:
	Blog/Web.Debug.config
	Blog/Web.Release.config
Merge branch 'master' of https://github.com/amos402/blog