0.6.3 Release - see CHANGELOG.md for release notes.
Merge commit 'b047d65bea6d90de6257651ead7f22c39e1e2b9e' into integration
Update Changelog for 0.6.4 release preparation.
Merge remote-tracking branch 'remotes/origin/development' into integration
0.6.5 CHANGELOG.md updated for 0.6.5 Release Candidate
Gemfile Upgrade
Locking Gemfile rack version to current supported rails version.
Trap the WebSocketError from em-websocket when the connection is closing.

em-websocket raises an exception if we send to a WebSocket when it is
closing. But there doesn't appear to be a way to detect this condition
when the WebSocket is closed from the other side. This patch catches
the exception for this condition and just logs it.

References #1209, #1640, #1710.
Adding 0.6.4.1 patch information to CHANGELOG.md
Version update.
0.6.6 Release Preparation
0.6.6 CHANGELOG.md updates for release
Merge remote-tracking branch 'remotes/origin/development' into integration
Integration of 0.6.8 Development
Integration of 0.6.9 Baseline Release
0.6.9 Baseline Integration
0.6.10 Release Preparation

Conflicts:
	public/radio/radio.DAE
Remove unused timer that is incompatible w/ Firefox

fixes #2033
Merge async.series operations without an async mode with those that do.

Some intermediate steps in async.series sequences always completed
synchronously and didn't actually need async support. Sequences were
arranged that way for clarity, but having unnecessary steps in a
series sequence is expensive on the stack.

These steps have been merged down into the following async step, or
merged into the completion function when they were at the end of
the sequence.

References #2035.
Collapse async.series sequences of length 1. References #2035.