Updated aws-sdk gem from 1.40.0 to 1.42.0 and nokogiri gem from 1.6.1 to 1.6.2.1
Updated feedjira gem from 1.2.0 to 1.3.0

This enables xhtml-escaping of entries in feedburner atom feeds. For more about this see this pull request:

https://github.com/feedjira/feedjira/pull/222
Added unit test for parsing feedburner atom feeds with xhtml content.
Updated resque-scheduler from 2.5.5 to 3.0.0
Updated rubyzip gem from 1.1.3 to 1.1.4
Updated database_cleaner gem from 1.2.0 to 1.3.0
Updated rspec-rails from 2.14.2 to 2.99.0

This pulls updates of several rspec gems (rspec-mocks, rspec-core, rspec-expectations, rspec-collection_matchers) to version 2.99.0
Updated spring gem from 1.1.2 to 1.1.3
Update activeadmin gem to latest master HEAD.
Minor changes required by the update to resque-scheduler 3.0.0
Fixed tests.
Renamed method in the latest ActiveAdmin master version.
Removed javascript, font and css assets which are linked from a CDN.

They are never downloaded from Feedbunch's deployment, so it's not necessary having them in the repo. Also, it makes upgrades easier (no need for maintenance on those files when upgrading AngularJS version, e.g.).
Updated Fontawesome from 4.0.3 to 4.1.0
Updated angularJS from 1.2.13 to 1.2.16
Remove Rspec 3 deprecation warning: the receiving instance is yielded to the first argument to any_instance implementation blocks.
Fix bugs in tests introduced in commit d6f44a72f14a844111280d2b58ad966577f6edae.
Reorganized specs into specs/unit_tests and specs/acceptance_tests directories. Added metadata to all tests to let rspec-rails know the type of each test suite (controller, model, feature etc).

Older rspec-rails versions demanded a particular directory structure for the specs, so that e.g. controllers tests (which had to be in /specs/controllers) had a module mixed in during testing, to enable helper methods necessary for each type of test (e.g. accessing response headers directly during controller tests).

This is being deprecated and it will become opt-in in rspec-rails 3. A particular directory structure will no longer be enforced, each test suite will have to specify the type of test by using metadata (a :type named argument to the "describe" method at the top of each file).

I've gone ahead and, in preparation for rspec-rails 3, I've added metadata to all tests which make use of rspec-rails helper methods. Now that a particular directory structure is no longer enforced, I've reorganized tests in a "unit_tests" and "acceptance_tests" structure which is more confortable for me.

For details about the old directory structure and the new metadata-based spect type specification, see:

https://relishapp.com/rspec/rspec-rails/v/3-0/docs/directory-structure

For interesting discussions about this topic see:

https://github.com/rspec/rspec-rails/issues/662
https://github.com/rspec/rspec-rails/pull/970/files
https://github.com/rspec/rspec-rails/pull/1002
Fix tests.

In all cases the error was that the relative path to a file loaded during testing has changed with the recent reorganization of spec directories.
Remove rspec 3 deprecation warning: passing a block to "and_return" with {..} syntax is deprecated.

Actually my intention was never to pass a block to those and_return calls. I intended to pass an empty hash as argument to and_return. Hopefully the parentheses will make ruby understand me. We sometimes have a strained relationship and communication problems.