Merge remote-tracking branch 'origin/master'

Conflicts:
	Training.CMS/Training.CMS.v12.suo
	Training.CMS/Training.Web/Web.config