html strict conformance
Merge branch 'master' of https://github.com/lmsgit/lms
Merge branch 'master' into nicraM