clusters
Merge branch 'master' of https://github.com/devDesign/KarmaCloud

Conflicts:
	app/actions.rb