Merge branch2 into branch1

Conflicts:
	protected/views/courses/view.php