Merge remote-tracking branch 'origin/master'

Conflicts:
	src/TCPClient.java
	src/model/QOTD/QOTDModel.java