Bastion: adding use of angular-gettext in javascript files to readme.
Merge pull request #3277 from waldenraines/devel

Bastion: adding use of angular-gettext in javascript files to readme.
Fixes #3281 - Adds explicit button type to cancel button to allow
form submit on enter.
Merge pull request #3282 from ehelms/issue-3281

Fixes #3281 - Adds explicit button type to cancel button to allow
Repository: Adding sync management crosslink on display of sync status
and a button to allow users to initiate a sync directly from the repository
details page.
Bastion: Converting Menu to loaded HTML.
Merge pull request #3286 from ehelms/menu-html

Bastion: Converting Menu to loaded HTML.
Merge pull request #3139 from ehelms/repository-details-sync

Repository: Adding sync management crosslink on display of sync status
Merge remote-tracking branch 'upstream/master' into devel-merge

Conflicts:
	app/controllers/api/v2/repositories_controller.rb
	app/models/authorization/repository.rb
	engines/bastion/app/assets/bastion/systems/details/views/system-info.html
	engines/bastion/app/assets/bastion/systems/details/views/system-subscriptions.html
Replacing some occurrences of i18n filter with translate directive.
Merge pull request #3289 from waldenraines/devel-merge

Merge remote-tracking branch 'upstream/master' into devel-merge
Remove rails-dev-boost gem from default set of gems for development

Since rails 3.2 there were radical improvements in reloading the code,
not making the rails-dev-boost as useful as before. Using it however
breaks the doc reloading feature in development mode.

If somebody misses that, he can still add it to some
bundler.d/local_*.rb file
Merge pull request #3300 from iNecas/remove-devel-boost

Remove rails-dev-boost gem from default set of gems for development
Bastion: Adding htmlhint grunt task to lint HTML files.
Merge pull request #3304 from ehelms/htmlhint

Bastion: Adding htmlhint grunt task to lint HTML files.
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.