new branch
Merge remote-tracking branch 'origin/zban_lalka'

Conflicts:
	src/network/Main.java
Merge izban's branch. Some refactorings.