Conflicts:
	mod/scorm/db/upgrade.php

This reverts commit 093a6fe7, reversing
changes made to 88a4cb47.

This reverts commit e89dfdbc.

This reverts commit eeb08203.

- p.e. replaced by e.g. which sounds more English-friendly
- Adding an extra line break as markdown don't like
p and li together

Conflicts:
	theme/base/style/core.css
	theme/bootstrapbase/less/moodle/core.less
	theme/bootstrapbase/style/moodle.css

Conflicts:
	lib/editor/atto/styles.css

Conflicts:
	lib/editor/atto/styles.css

Eric Merrill authored Sep 17, 2013 and Marina Glancy committed Sep 25, 2013

Makes an option to either default to the activity default, or default
to COMPLETION_TRACKING_NONE. This leaves open the possibility of
allowing activities to pick an actual default, instead of just on/off.

Also changing course_backend.php coding style
according to codechecker.