Merge "Move app.js to jquery.zuul.js to indicate a plugin"