1. remove merge conflict codes in app.js
2. use CDN for all javascript libraries