addes missing taxonomy asset
Small typo in foreman-config output
fixes #2376 Update migrations to match new rails3.2 paths
fixes #2377 - refresh column info after editing Medium

Fixes error in 20110725142054_add_suse_templates referencing non-existent
operatingsystem_id column.
fixes #2153 - add trusted_puppetmaster_hosts setting to permit puppetmaster access

Connections to fact + report upload and externalNodes will be permitted from
any host listed in the trusted_puppetmaster_hosts setting, bypassing the
requirement for a registered smart proxy.

Setting model updated to support empty arrays for values and defaults.
fixes #2385 - use Capybara 2.0.x for Ruby 1.8 compatibility
fixes #2389 - Add basic support for plugin config to live in separate files
Added link to host on some audit entries
fixes failing test/fixture introduced in 7ff39bfa
flot charts

Use flot charts instead of highcharts.
flot charts license is more friendly.

This version of the code is feature compatible with the old charts,
including:
pie: drill-down and expend.
stacked charts: zoom, hide series in legend.
all types has tooltips.
etc.
fixes #2327 - add simplecov code coverage reports
Merge remote-tracking branch 'foreman/develop' by rel-eng/build.sh
Automatic rebase to latest nightly Foreman
Automatic commit of package [foreman] minor release [1.1stable-21.b28e1ab].