Merge branch 'develop' of https://github.com/LabKey/cds into develop
Changes to app.js and cube.js for active application configuration (r34145)