Upgrade to rails 4
Merge branch 'master' into rails4

* master: (26 commits)
  Remove jeditable (old and buggy).
  More efficiently reload masonry.
  Update masonry and improve resize logic
  Use connection pool in worker
  Configure sidekiq monitoring.
  Add a worker for reprocessing images.
  Update gems.
  Resize original image.
  Don't display categories in recent albums
  Fix spec when run in random order.
  Update gems
  Fix issue with admin feed
  Fix issue when setting certain sources.
  Make album source list ordered by name.
  Fix image deletion.
  Really fix favorites feature & add tests.
  Fix issue with favoriting
  Correctly include JS templates
  Update gems
  Add a named route from paginated albums
  ...

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/comments_controller.rb
	app/models/album.rb
	app/models/image.rb
Fix various regressions from upgrade
Merge branch 'master' into rails4

* master:
  Fix a couple regressions after masonry refactor.
Update and reorganize dependencies (JS & Gems).
Refactor the image model and add specs.
Add middleware to speed up dev mode
Update to rails 4 release version.
Merge branch 'master' into rails4

* master:
  Add middleware to speed up dev mode
  Refactor the image model and add specs.
  Update and reorganize dependencies (JS & Gems).
  Refactor source merge and improve test coverage.
  Minor random code cleanup.
  Switch to the 'blueimip-gallery' plugin.
  Simple refactoring to archive model.
  Refactor selected source form helper.

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/images_controller.rb
	app/models/source.rb
	app/views/layouts/application.html.haml
Get rid or rspec deprecation warnings.
Fix merge issue.
Fix bug in JS image template.
Workaround styling issue for icons within buttons.
Remove unused spec