Merge branch 'master' into taSyncBar
Fixing strip picture link
Adding icns file and settings
removing useless include
Merge branch 'taSyncBar'
Merge branch 'master' of https://github.com/Phonations/Joker