for dif
Merge branch 'master' of https://github.com/xupeilong/InternetRuntimev2

Conflicts:
	InternetRT/app/org/internetrt/core/siblings/ClusterManagerImpl.scala
	InternetRT/public/client/Client.html
fix bug,remove cid?