Use foreman-1.3 for katello integration
Added how-to doc for using optional gems
1013113 - fixing traceback on repo discovery page
Bug 1016114: Adds a prepopulation of systems from Candlepin to make
use of their bulk fetching API to improve API/UI rendering times.
Bug #1012583 - redirecting nutupane pages in order to force reload.
Update rubygem-kafo (including the deps for progress bar)
Merge pull request #3152 from daviddavis/temp/20131009160518

Added how-to doc for using optional gems
Merge pull request #3140 from iNecas/use-foreman-1.3

Use foreman-1.3 for katello integration
Merge pull request #3159 from jlsherrill/1013113

1013113 - fixing traceback on repo discovery page
Fix foreign key issues

Add missing :dependent to all associations not to left orphan
records behind causing foreign key constraint issues
Merge pull request #3158 from waldenraines/bug-1012583

Bug #1012583 - redirecting nutupane pages in order to force reload.
Merge pull request #3160 from pitr-ch/bug/996685

Fix foreign key issues
Merge pull request #3100 from ehelms/bulk-systems-candlepin

Bug 1016114: Adds a prepopulation of systems from Candlepin to make
Merge remote-tracking branch 'upstream/master' into devel-merge

Conflicts:
	app/controllers/api/v1/repositories_controller.rb
	engines/bastion/app/assets/bastion/systems/details/views/system-info.html