CLC-641 - Fix Content-Type for JSON API
https://jira.media.berkeley.edu/jira/browse/CLC-641
Merge pull request #288 from christianv/CLC-641

CLC-641 - Fix Content-Type for JSON API
CLC-727 Make SakaiProxy fakeable; extract BaseProxy class as parent
CLC-727 Add VCR recording of real Sakai data; don't record x-sakai-tokens
CLC-727 Fix failing tests by adding query-string matching to VCR recording
Merge pull request #289 from ctweney/clc-727

CLC-727 Making Sakai fakeable
CLC-526 Add My Course Sites controller; DRY the pattern a bit; convert site ID to string
CLC-736 Starter OAuth/preferences landing page
https://jira.media.berkeley.edu/jira/browse/CLC-736
Merge pull request #294 from christianv/wip2

CLC-736 Starter OAuth/preferences landing page
CLC-646 - SASSify dashboard
https://jira.media.berkeley.edu/jira/browse/CLC-646

* Abstractify all the colors
* Use SASS functions instead of .erb files (necessary for @include) see http://rubydoc.info/github/petebrowne/sprockets-sass/master/Sprockets/Sass/Functions
* Use @include instead of require and add a comment about it
Merge pull request #293 from christianv/CLC-646b

CLC-646 - SASSify dashboard
Merge pull request #292 from raydavis/raywip

CLC-526 Add My Course Sites controller
[NOJIRA] Updated fakeweb -> webmock, increase test coverage
[CLC-658] First stab at the upnext/tasks task
Merge pull request #291 from yuhunglin/NOJIRA3

[NOJIRA] Test updates for more coverage
Merge pull request #295 from yuhunglin/CLC-658

[CLC-658] First stab at the upnext/tasks task
CLC-526 Store encrypted access tokens
Lower security in RAILS_ENV=test to work around Java's default restrictions.
CLC-526 Include Canvas access status in my/status feed
Merge pull request #296 from raydavis/raywip

CLC-526 Encrypt access tokens; provide Canvas access status
CLC-738 - Unneeded "has_bspace_access_token"
https://jira.media.berkeley.edu/jira/browse/CLC-738