OOP: Small fixes
Merge remote-tracking branch 'upstream/master' into updateCompletion

Conflicts:
	src/uLearn.Web/Scripts/_references.js