LessonController.cs
Merge branch 'master' of https://github.com/staafl/team-azure-dragon
Merge branch 'master' of https://github.com/staafl/team-azure-dragon
Kendo SkillController.cs
Merge branch 'master' of https://github.com/staafl/team-azure-dragon

Conflicts:
	src/LearningSystem.App/LearningSystem.App.csproj