merge -demos and -solutions into appacademy org