[CLC-1988] Prototype - investigate and develop strategy for integrating textbook feed
[CLC-1988] Prototype - investigate and develop strategy for integrating textbook feed
CANVAS-265, completed a compromise design that will suffice if we don't have time to revisit this until the next sprint. Adds to, does not replace the previous commit.
Merge pull request #1783 from elicochran/CANVAS-265

CANVAS-265, completed a compromise design
CLC-2734 Upgrade to JRuby 1.7.6
CLC-2693 - Redirect to logout page on 401 on /api/my/updated_feeds
Merge pull request #1786 from ctweney/clc-2734

CLC-2734 Upgrade to JRuby 1.7.6
CLC-2780 and CLC-2757: Include last modified time and hash in merged feeds
Merge pull request #1788 from ctweney/clc-2780

CLC-2780 and CLC-2757: Include last modified time and hash in merged feeds
CLC-2780 Fix failing MyUpNext test
Merge pull request #1787 from anair13/CLC-2693

CLC-2693 - Redirect to logout page on 401 on /api/my/updated_feeds
Merge pull request #1789 from ctweney/clc-2780

CLC-2780 Fix failing MyUpNext test
[CLC-1988] Prototype - investigate and develop strategy for integrating textbook feed
[CLC-1988] Prototype - investigate and develop strategy for integrating textbook feed
CLC-2799 - Show DPP balance and normal installment amount
https://jira.media.berkeley.edu/jira/browse/CLC-2799
Merge pull request #1790 from christianv/CLC-2799

CLC-2799 - Show DPP balance and normal installment amount
CLC-2757 - Misleading initial dashboard display on Up Next
Merge pull request #1791 from christianv/CLC-2757

CLC-2757 - Misleading initial dashboard display on Up Next
CLC-2803 - CFV - DppNormalInstallmentAmount = 0 do not show the DPP installment line in the UI
https://jira.media.berkeley.edu/jira/browse/CLC-2803
Merge pull request #1792 from christianv/CLC-2803

CLC-2803 - CFV - DppNormalInstallmentAmount = 0 do not show the DPP inst...