-repaired encoding of file
-repaired file encoding
-removed @Override annotation
-make SendInterest and SendKnowledge public
Merge branch 'master' of https://github.com/SharedKnowledge/SharkFW

Conflicts:
	src/java/j2se_android/net/sharkfw/peer/J2SEAndroidSharkEngine.java