merge changes
Merge branch 'push' of github.com:articlemetrics/alm into push

Conflicts:
	app/controllers/api/v3/articles_controller.rb
	app/controllers/concerns/articable.rb
	app/decorators/agent_decorator.rb
	app/decorators/alert_decorator.rb
	app/decorators/source_decorator.rb
	app/models/agent.rb
	app/models/agents/wos.rb
	app/models/api_response.rb
	app/models/concerns/countable.rb
	app/models/concerns/networkable.rb
	app/models/concerns/statable.rb
	app/models/filters/source_not_updated_error.rb
	app/models/notification.rb
	app/models/publisher.rb
	app/models/source.rb
	app/models/status.rb
	app/models/task.rb
	app/models/work.rb
	app/views/api/v5/articles/index.rabl
	app/views/api/v5/sources/show.rabl
	app/views/articles/_metrics.html.erb
	app/views/articles/_more.html.erb
	app/views/sources/show.rss.builder
	config/application.rb
	config/routes.rb
	db/migrate/20141108112518_add_agents_table.rb
	db/schema.rb
	features/step_definitions/source_steps.rb
	lib/agent_job.rb
	spec/apis/v3/articles_cache_spec.rb
	spec/apis/v3/articles_spec.rb
	spec/apis/v3/identifiers_spec.rb
	spec/apis/v3/private_spec.rb
	spec/apis/v4/alerts_spec.rb
	spec/apis/v5/articles_cache_spec.rb
	spec/apis/v5/articles_spec.rb
	spec/apis/v5/private_spec.rb
	spec/apis/v5/sources_spec.rb
	spec/controllers/sources_controller_spec.rb
	spec/factories/agents.rb
	spec/factories/default.rb
	spec/lib/agent_job_spec.rb
	spec/models/trace_spec.rb