Move to bootstrap-based UI
Merge pull request #13 from tboerger/feature/bootstrap-ui

[stoney] Move to bootstrap-based UI
Moved role constraints into model and removed edit deployment
Merge pull request #14 from tboerger/feature/constraint-move

Moved role constraints into model and removed edit deployment
Removed the single assignment block from constraints

(cherry picked from commit 1b19c72422ba58ecf0d6f5d4497044ef20eb7fab)
Merge pull request #23 from vuntz/release/stoney/master

Removed the single assignment block from constraints
Merge branch 'release/roxy/master' into roxy-sync

Conflicts:
	crowbar_framework/app/helpers/pacemaker_barclamp_helper.rb
	crowbar_framework/app/views/barclamp/pacemaker/_edit_attributes.html.haml
Merge pull request #19 from vuntz/sync-roxy

Sync with roxy
Merge branch 'release/roxy/master' into roxy-sync
Merge pull request #85 from vuntz/roxy-sync

Merge roxy branch into stoney
Merge branch 'release/roxy/master' into roxy-sync
Merge pull request #93 from vuntz/roxy-sync

Roxy sync
Merge branch 'release/roxy/master' into roxy-sync-again
Merge pull request #99 from vuntz/roxy-sync-again

Merge roxy branch into stoney
Install xfsprogs if we're using xfs for a DRBD device
sbd: Wait for cluster to be up after corosync restart

Every time we start corosync, we need to wait for the cluster to be up.
And when we use sbd, we restart corosync to start sbd, so we need to
wait there too.
Merge pull request #101 from vuntz/install-xfs

Install xfsprogs if we're using xfs for a DRBD device
Fix installation of xfsprogs
Merge pull request #102 from vuntz/sbd-sync

sbd: Wait for cluster to be up after corosync restart
Merge pull request #103 from vuntz/install-xfs-fix

Fix installation of xfsprogs