adding distributor version display in the UI
adding distributor version output for the API
fixing distributor version minitests
candlepin vcr cassettes
Bastion: allow adding additional menu items to detail sub-menus.

This PR allows arbitrary menu items to be placed in the sub-menus
on nutupane detail pages.
Merge pull request #3297 from waldenraines/pluggability

Bastion: allow adding additional menu items to detail sub-menus.
Bastion: Fixes broken coverage report generation.
Merge pull request #3320 from ehelms/fix-devel-coverage

Bastion: Fixes broken coverage report generation.
Bastion: Adding documentation on how to run HTML linting.
Merge pull request #3324 from daviddavis/html-lint-doc

Bastion: Adding documentation on how to run HTML linting.
Merge pull request #3328 from iNecas/bz/995123

995123 - prefer java-1.6.0-openjdk over java-1.7.0-openjdk
Merge pull request #3280 from komidore64/distrib-display

adding distributor version display in the UI
Merge remote-tracking branch 'upstream/master' into devel-merge

Conflicts:
	app/controllers/users_controller.rb
	app/views/common/_fav.html.haml
	app/views/organizations/_footer.html.haml
Fixing a couple of merge problems including vcr cassettes.
Merge pull request #3330 from waldenraines/devel-merge

Merge remote-tracking branch 'upstream/master' into devel-merge
Bastion: upgrading AngularJS to version 1.2.0-rc3.
Bastion: adding alch-header to incubator.
Merge pull request #3347 from waldenraines/devel-angular

Upgrading AngularJS and moving alch-header into incubator.
Bastion: migrating from AngularJS 1.2.0-rc3 to 1.2.0.
Merge pull request #3359 from waldenraines/devel-angular

Bastion: migrating from AngularJS 1.2.0-rc3 to 1.2.0.