Merge pull request #113 from liuch/master

more optimal use of conditional compilation
fix is100
fix search in roster (issue #107)
expand/collapse roster groups on group icon singleclick
update iris
more effenctive work with options
some improvements for contactlist repainting
some fixes for history (is 109 and other)
fix is108
2014 at aboutdlg
try to fix wrong tray icon
fix handling + at url (is 102)
always show contacts with events (is 42)
add forgotten initialization
Fixing casting from pointer to int

src/psitrayicon.cpp converted icon_ (a pointer) to int, which caused
error when compiled for 64 bit. Therefor the casting was changed to
intptr_t inorder to solve the compilation error.
Merge pull request #118 from DiGMi/master

Fixing casting from pointer to int
more improvements for tray icon
fix nick changing after kick from muc
improve psiplugin.pri
less options use at alerticon