Added javadoc for heartbeatsocket
Added javadoc for filenode
Merge origin/master