javadoc
otro
update_log removed
Encrypter comments
FileManager comments
javadoc for log done
Merge branch 'group7/develop' of https://github.com/maxfindel/gameworks into group7/develop
Generating methods descriptions of Persistence/IFile
javadoc for log done
Editing comments' format in Persistence/IFile
Merge branch 'group7/develop' of github.com:maxfindel/gameworks into group7/develop
new javadoc
 dosumentation init
conflicts
network api interface
new javadoc
Merge branch 'group8/master' of https://github.com/maxfindel/gameworks into group8/master

Conflicts:
	doc/allclasses-frame.html
	doc/allclasses-noframe.html
	doc/constant-values.html
	doc/deprecated-list.html
	doc/help-doc.html
	doc/iic2113/gameworks/network/Connection.html
	doc/iic2113/gameworks/network/GameInstance.html
	doc/iic2113/gameworks/network/Main.html
	doc/iic2113/gameworks/network/Network.html
	doc/iic2113/gameworks/network/NetworkMessage.html
	doc/iic2113/gameworks/network/Receiver.html
	doc/iic2113/gameworks/network/Sender.html
	doc/iic2113/gameworks/network/User.html
	doc/iic2113/gameworks/network/class-use/Connection.html
	doc/iic2113/gameworks/network/class-use/GameInstance.html
	doc/iic2113/gameworks/network/class-use/Main.html
	doc/iic2113/gameworks/network/class-use/Network.html
	doc/iic2113/gameworks/network/class-use/NetworkMessage.html
	doc/iic2113/gameworks/network/class-use/Receiver.html
	doc/iic2113/gameworks/network/class-use/Sender.html
	doc/iic2113/gameworks/network/class-use/User.html
	doc/iic2113/gameworks/network/package-frame.html
	doc/iic2113/gameworks/network/package-summary.html
	doc/iic2113/gameworks/network/package-tree.html
	doc/iic2113/gameworks/network/package-use.html
	doc/index-files/index-1.html
	doc/index-files/index-10.html
	doc/index-files/index-11.html
	doc/index-files/index-2.html
	doc/index-files/index-3.html
	doc/index-files/index-4.html
	doc/index-files/index-5.html
	doc/index-files/index-6.html
	doc/index-files/index-7.html
	doc/index-files/index-8.html
	doc/index-files/index-9.html
	doc/index.html
	doc/overview-tree.html
	doc/serialized-form.html
doccc
javadoc new version
adding documentation