Add app.js back from branch misshap
Update missing files from previous merge of bearded-beta