added some models
Merge origin/master

Conflicts:
	chat-client/src/core/view/swing/MainForm.java
Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	chat-client/src/core/view/swing/MainForm.java