update app.js
update substantial
update routes
fix merging problem in routes and app