fixat lite i smileys
Merge branch 'master' of github.com:/hansfilipelo/ChattY

Conflicts:
	gui/chatwindow.cpp