Merge branch 'master' of https://github.com/opencrowbar/core

Conflicts:
	bootstrap/cookbooks/crowbar-bootstrap/recipes/default.rb
Merge branch 'master' of https://github.com/newgoliath/core