CLC-1241 Get count of unread bMail messages
https://jira.media.berkeley.edu/jira/browse/CLC-1241

Huge thanks to Yu-Hung for the great refactoring work on this.
[NOJIRA] QA: Rake task to 'delete/move and archive' tokens
Merge pull request #920 from yuhunglin/NOJIRA2-qa

[NOJIRA] QA: Rake task to 'delete/move and archive' tokens
CLC-1241 Get count of unread bMail messages

- Moved logging line into the proxy
- Moved atom_feed reference into settings
CLC-1241 Show count of unread bMail messages

- Removed the inheritance from BaseProxy
- Added MyBadges::GoogleMail into the cache expiration list
Merge pull request #911 from shacker/CLC-1241-qa

CLC-1241 Get count of unread bMail messages
[NOJIRA] QA: Relax travis failure check on jruby-head due to thread fiber issues with Celluloid
Merge pull request #931 from yuhunglin/NOJIRA-qa

[NOJIRA] QA: Relax travis failure check on jruby-head due to thread fiber issues with Celluloid
CLC-1635 Fix ref to the default cache expiration value
Merge pull request #933 from ctweney/clc-1635-qa

CLC-1635 QA branch Fix ref to the default cache expiration value
CLC-1636 - Security Review.4/5 Results
https://jira.media.berkeley.edu/jira/browse/CLC-1636

Conflicts:

	config/routes.rb
[CLC-1636] Fix act_as tests
Merge pull request #934 from ctweney/clc-1636-qa

CLC-1636 QA branch version of CSRF security fixes
[CLC-1641] QA: Small typo leading to scope leakage through cache. Adding a test to guard against it
Merge pull request #936 from yuhunglin/CLC-1641-qa

[CLC-1641] QA: Small typo leading to scope leakage through cache. Adding a test to guard against it
CLC-1655-qa - Act-as feature should reload page for you
https://jira.media.berkeley.edu/jira/browse/CLC-1655
Merge pull request #938 from christianv/CLC-1655-qa

CLC-1655-qa - Act-as feature should reload page for you
CLC-1663 Logout now allows GET when developer auth mode is enabled
Merge pull request #942 from ctweney/clc-1663-qa

CLC-1663 QA branch Logout now allows GET when developer auth mode is enabled
CLC-1642 For now, only show site-wide bSpace announcements