Add warning that the user is on the beta-site if he is.
Merge branch 'fixed_quiz'