layout profile
Merge remote-tracking branch 'origin/master' into activity-admin
allow edit a simple question in course admin page