CHRIS EST UN PONEY
Merge branch 'master' of https://github.com/Frumba/QiQi

Conflicts:
	msn/messengerform.cpp
sql