[CLC-1369] Initial implementation for new google calendar badges, backend feed
[CLC-1662] MyUpNext model rewrite
[CLC-1369] Resolving merge issues
Merge pull request #929 from yuhunglin/CLC-1369

[CLC-1369] Initial implementation for new google calendar badges, backend feed
Merge pull request #946 from yuhunglin/CLC-1662

[CLC-1662] MyUpNext model rewrite
CLC-1652 Don't expire cache if user ID is null
CLC-1648 Add Bearfacts profile feed and fake data
[CLC-1639] Modified bMail feed for badges
[CLC-1639] New sorting schema
[CLC-1639] Bad modification dates means bad news for front end code
Merge pull request #947 from ctweney/clc-1652

CLC-1652 Don't expire cache if user ID is null
Merge pull request #948 from yuhunglin/CLC-1639

[CLC-1639] Modified bMail feed for badges
Merge pull request #949 from yuhunglin/CLC-1638b

[CLC-1638] New sorting schema
[CLC-1639] Links need to be parsed differently, allowing it to fail the entry since no link to the email probably means busted entry
CLC-1648 Rename RegBlocks controller and model to MyAcademics, and adjust feed structure
CLC-1648 Add college and level section to academics feed
CLC-1648 Warm and expire cache for My Academics
[CLC-1640] Changes to the drive list feed for badges
Merge pull request #950 from yuhunglin/CLC-1639

[CLC-1639] Links need to be parsed differently, allowing it to fail the ...
[CLC-1640] Clean up syntax