Fixed #344 Mac branch: no conflict popup
Merge branch 'OSX_notification'
Fixed #359 Better menu ber icon for Mac
Update side-splash image
Change CmisSync folder icon
Change tutorial slide image for Mac
Merge branch 'update_pixmaps'
Merge branch 'master' of https://github.com/nicolas-raoul/CmisSync
bumped version 1.2.2
Change packaing script for Mac