provide some tests (cucumber and spec) for provider-selection
fix issue #261
Edit src/config/compass.rb to match newest compass reqs

This removes three lines from src/config/compass.rb because they
are incompatible with the newest upstream version of rubygem-compass.
Merge pull request #316 from eggmaster/compass-fix

Edit src/config/compass.rb to match newest compass reqs
List all provider's hardware profiles

Added tab 'Hardware Profiles' to provider's details. User is now abled
to see all hardware profiles of defined provider. The patch includes
cucumber test for displaying hardware profile under provider.

https://github.com/aeolusproject/conductor/issues/319
fix secret_token initialization
Merge pull request #323 from jzigmund/list_hwp

List all provider's hardware profiles
Merge pull request #301 from martinpovolny/sekreeet

fix secret_token initialization
fix issue #264
Merge pull request #300 from martinpovolny/fix_catalog

fix issue #261 - fixed removing catalog entry in deployables#show
Merge pull request #295 from martinpovolny/fix_priority_group_fix

fix issue #264
cost: fix issue #325
Update rails to 3.2.12ish
ProviderAccount fixes for rails 3.2.11

Call load_provider on ProviderAccount edit:

@provider is used in edit.html.haml but isn't loaded.  This worked
with rails 3.2.3 but stopped working with rails >= 3.2.4.  I have no
idea how it ever worked originally.  This explicitly calls
load_provider, but only after calling require_privilege (and thus not
from before_filter).  Otherwise load_provider will throw an exception
if the correct permissions aren't set.

Add load_provider to before_filter for update:

In update, if provider_account doesn't validate, the view renders the
edit action, which needs @provider in order to construct the edit
path.
BUGFIX: Don't force system ruby

Dbomatic would only use system ruby before, which caused it to fail if
you were using a modern ruby via rvm or rbenv.
Merge pull request #336 from jguiditta/fix_dbomatic_ruby

BUGFIX: Don't force system ruby
Merge pull request #331 from martinpovolny/max_price

cost: fix issue #325
Merge pull request #332 from jeckersb/rails-3.2.12ish

Rails 3.2.12ish
Tim - added gem, migrations and mountpoint

- Rails version in Gemfile.lock updated to 3.2.8 which is required by Tim
- 'model_Validations' branch is for now used for Tim, because of a bug in Rails
master branch doesn't include model validations patch yet
Tim - added roles for BaseImage and Template models