ыв
Merge branch 'master' of https://github.com/maxventu/ExerNet

Conflicts:
	Controllers/TaskController.cs
	Scripts/_references.js