Fix breakage from refactoring.
Add common js file.
Merge branch 'master' into port-to-backbone
Back to workong on Backbone port.