refactoring
view change fixes
Merge branch 'master' of github.com:pluto-/Gcom

Conflicts:
	core/src/main/java/gcom/messagesorter/MessageSorter.java
	utils/src/main/java/gcom/utils/VectorClock.java