modify source
modify source code
Merge remote-tracking branch 'remotes/banrui/ph3/bando_20140520' into ph3

Conflicts:
	app/views/cluster/index.html.erb
improve design