Merge pull request #3 from crowbar/release/pebbles/master

Release/pebbles/master
Merge pull request #5 from crowbar/release/pebbles/master

Release/pebbles/master
Remove bogus crowbar.png

This is actually a HTML file and is not referenced anywhere in the code.
The actual crowbar.png in use is at `public/images/layout/crowbar.png`.
Replace github.com/dellcloudedge mentions with github.com/crowbar
Rename KEEP_ME file to KEEP_THIS

We already have several KEEP_THIS files, so make this consistent. This
makes it easier to remove all these files.
Merge pull request #553 from vuntz/replace-dellcloudedge

Replace github.com/dellcloudedge mentions with github.com/crowbar
Merge pull request #554 from vuntz/consistent-KEEP_THIS

Rename KEEP_ME file to KEEP_THIS
Merge pull request #6 from crowbar/release/pebbles/master

Merge for testing
Zap excessive deep_merge debugging output.
Revert "Deactivate (and dequeue) proposal when deleting it"

This reverts commit a69f7417519febc110b84fac088d3a1cf05c7525.

Conflicts:

	crowbar_framework/app/models/service_object.rb
freeze activesupport for a while
Merge pull request #556 from MirantisDellCrowbar/release/pebbles/unstable/master

freeze activesupport for a while
Merge pull request #551 from jamestyj/release/pebbles/master-remove-bogus-crowbar.png

Remove bogus crowbar.png
Merge pull request #555 from VictorLowther/pull-req-release-pebbles-master-49ce6f80de50886f5a801a915f6b662bceb939ee

Unbreak Pebbles smoketest and unviolate the API. [1/1]
[IBS] (Patch1) Remove Dell footer

Move `remove-dell-footer.patch` from IBS [1] to Git.

[1] https://build.suse.de/package/show?package=crowbar-barclamp-crowbar&project=Devel%3ACloud%3A2.0
[IBS] (Patch2) Replace error contact message with SUSE one

Move `error-contact-cloud-beta.patch` from IBS [1] to Git.

[1] https://build.suse.de/package/show?package=crowbar-barclamp-crowbar&project=Devel%3ACloud%3A2.0
[IBS] (Patch3) Replace login realm with SUSE specific message

Move `suse-login-realm.patch` from IBS to Git.

[1] https://build.suse.de/package/show?package=crowbar-barclamp-crowbar&project=Devel%3ACloud%3A2.0
[IBS] (Patch4) Disable pull-from-source (PFS)

Move `no-pfs.patch` from IBS [1] to Git.

[1] https://build.suse.de/package/show?package=crowbar-barclamp-crowbar&project=Devel%3ACloud%3A2.0
[IBS] (Patch5) Add style to redirect page

Move `suse-style-redirect.patch` from IBS to Git.

[1] https://build.suse.de/package/show?package=crowbar-barclamp-crowbar&project=Devel%3ACloud%3A2.0
[Bundler] Use Bundler to manage gems (for development)

This was added in the past, but it apparently caused problems so was
disabled (instead of fixing the actual issues).

Using the official code from http://gembundler.com/v1.3/rails23.html.

This change makes the development workflow much more sane - just update
the Gemfile and `bundle install` to install and develop against the
specific gems and versions. This is particularly useful when
adding, testing, updating, or removing Gems. We can also be sure that
(eg. with `bundle exec`) we're ONLY using the specified set of Gems and
corresponding versions.

The product will still use Gems installed from RPMs (NOT `bundle
install`), so we need to keep the Gemfile updated accordingly.