CLC-3150 Fix timeout log messages for Canvas proxies
Allow periods in rails routes & encode uri slashes
CLC-3150 Use safe_json; log warning messages from Canvas import
CLC-3155 Fix broken youtube test
Merge pull request #2034 from ctweney/clc-3155

CLC-3155 Fix broken youtube test
Merge pull request #2032 from raydavis/raywip

CLC-3150 Fix timeout log messages for Canvas proxies
Merge pull request #2033 from edwlook/CLC-3047

CLC-3047 - 406 errors on the my videos feed
Merge pull request #2035 from haroonrasheed333/CLC-3071

[CLC-3071] Textbooks: Improve UI
CLC-2967 - AngularJS Upgrade
https://jira.media.berkeley.edu/jira/browse/CLC-2967
Merge pull request #2036 from christianv/CLC-2967

CLC-2967 - AngularJS Upgrade
Add caching to video feeds
Make PlaylistsProxy a global cache
Merge pull request #2037 from edwlook/CLC-3151

CLC-3151 - Implement caching for videos feed
CLC-3090: FinAid Messages: Dev environment is only showing old messages (mostly from 2012)

https://jira.media.berkeley.edu/jira/browse/CLC-3090

Changed the default settings for myfinaid_proxy.term_year to 2014

Important to note that this configuration setting is a sitting duck
for a future bug as it will have to be changed at just the right time
for the upcoming academic year unless we can find a way to stop
using it before then.  See Mike's comments to Bernie in this Jira.

Also, Settings.myfinaid_proxy.base_url is still pointing to
myfinaid's development api "https://apis-dev.berkeley.edu/myfinaid"
CLC-2980 - Implement - CFV - New landing page
https://jira.media.berkeley.edu/jira/browse/CLC-2980
Merge pull request #2038 from chikoon/CLC-3090-myfinaid-old-messages

CLC-3090: FinAid Messages: Dev environment is only showing old messages (mostly from 2012)
[CLC-3166] Textbook: Display Textbook feed only for the current and future semesters
Merge pull request #2041 from haroonrasheed333/CLC-3166

[CLC-3166] Textbook: Display Textbook feed only for the current and future semesters
[CLC-3133] Textbooks: Consolidate messages
Merge pull request #2040 from christianv/CLC-2980c

CLC-2980 - Implement - CFV - New landing page