More work on the Object Viewer Page
Resolving merge conflict in application.js