Merge branch 'develop'
Merge branch 'develop'
fix ruby major version link
Merge branch 'hotfix/ruby-version'
add package directive to install..
Merge branch 'hotfix/ruby-dependency-install'
Merge branch 'develop'
add host configuration for registrar
add router configuration for munin
Merge branch 'master' into develop

Conflicts:
	cookbooks/cf-ruby/recipes/default.rb
	cookbooks/munin/recipes/config_router.rb