Merge remote-tracking branch 'upstream/master' into devel

Conflicts:
	engines/bastion/app/assets/bastion/products/views/products.html
	engines/bastion/app/assets/bastion/systems/details/system-subscriptions.controller.js
	engines/bastion/app/assets/bastion/systems/systems.controller.js
Replacing occurrences of i18n filter with translate directive.
Rubocop: Updating rubocop to 0.14.1
Merge pull request #3172 from waldenraines/devel

Merge remote-tracking branch 'upstream/master' into devel
Merge pull request #3197 from daviddavis/temp/20131016144642

Rubocop: Updating rubocop to 0.14.1
Merge remote-tracking branch 'upstream/master' into devel-merge

Conflicts:
	app/models/organization_destroyer.rb
Merge pull request #3198 from waldenraines/devel-merge

Merge remote-tracking branch 'upstream/master' into devel-merge
Merge remote-tracking branch 'upstream/master' into devel-merge
Fixing rubocop by replacing raise with fail in a couple of places.
Merge pull request #3219 from waldenraines/devel-merge

Merge remote-tracking branch 'upstream/master' into devel-merge
1017396 - unable to import certv3 subscriptions from linked
distributor
Merge pull request #3234 from komidore64/distributor-failsauce

1017396 - unable to import certv3 subscriptions from linked distributor
Bastion: replacing haml org switcher with html org switcher.

Also adding fliter capability to resolve BZ #980160.
Merge pull request #3245 from waldenraines/org-switcher

Bastion: replacing haml org switcher with html org switcher.
Merge remote-tracking branch 'upstream/master' into devel

Conflicts:
	app/controllers/api/v1/systems_controller.rb
	engines/bastion/app/assets/bastion/products/new/product-form.controller.js
Bastion: upgrading ui-router to 0.2.0.
Merge pull request #3257 from waldenraines/devel

Merge remote-tracking branch 'upstream/master' into devel
Bastion: replacing transitionTo with ui-sref where possible.

This PR also removes several controller functions and tests that
are no longer needed because of this new functionality.
Merge pull request #3259 from waldenraines/upgrade-ui-router

Bastion: upgrading ui-router to 0.2.0.
Bastion: removing hrefs from html elements that use ui-sref.