everything
Merge branch 'master' of https://github.com/staafl/team-azure-dragon

Conflicts:
	src/LearningSystem.App/Views/Home/About.cshtml