modal edition's
Merge remote-tracking branch 'origin/expert' into expert

Conflicts:
	src/main/webapp/WEB-INF/pages/user/content/userCourses.ftl