Merge branch 'master' into production

Author: jloh02

website/src/featureFlags.ts

@@ -3,4 +3,4 @@
 /** Enable Course Planning Exercise */
 export const enableCPEx = true;
 
-export const showCPExTab = false;
+export const showCPExTab = true;