c2pc
Merge branch 'master' of https://github.com/unfouenvoyage/Test.git

Conflicts:
	Kube/src/com/unfou/Kube/Plugin.java