Code refactoring
Merge branch 'master' of github.com:euroelessar/qutim

Conflicts:
	core/main.cpp
	core/src/corelayers/adiumchat/lib/chatsessionimpl.cpp
Merge pull request #304 from gorthauer/master

Code refactoring