Merge pull request #1 from xtuple/master

update
Merge remote-tracking branch 'QTCLIENT/master'
Merge remote-tracking branch 'QTCLIENT/master'
Merge remote-tracking branch 'QTCLIENT/master'
Merge branch 'master' of https://github.com/gpazo/qt-client
Merge remote-tracking branch 'QTCLIENT/master'
Merge remote-tracking branch 'QTCLIENT/master'
Merge remote-tracking branch 'QTCLIENT/master'
Merge remote-tracking branch 'QTCLIENT/master'
Merge remote-tracking branch 'QTCLIENT/master'
Merge branch 'master' of https://github.com/gpazo/qt-client
vCard export for desktop client
fix
Merge remote-tracking branch 'QTCLIENT/master'
need to stash drop contacts lists
prepush
removed sExportVCard from contact
moved vcard parsing code to xtreewidget
fixed a lot of things
remove file include stuff from contact