big commit ahead, move along
now we pray
Merge remote-tracking branch 'origin/master'

Conflicts:
	kalambury-maven/src/main/java/pl/uj/edu/tcs/kalambury_maven/controller/AppController.java
	kalambury-maven/src/main/java/pl/uj/edu/tcs/kalambury_maven/model/ChatMessage.java
	kalambury-maven/src/main/java/pl/uj/edu/tcs/kalambury_maven/model/ChatMessagesList.java
	kalambury-maven/src/main/java/pl/uj/edu/tcs/kalambury_maven/model/SimpleModel.java
	kalambury-maven/src/main/java/pl/uj/edu/tcs/kalambury_maven/view/ChatBox.java
	kalambury-maven/src/main/java/pl/uj/edu/tcs/kalambury_maven/view/Ranking.java