adding jars
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server.iml
	pom.xml
newer version