Merge pull request #102 from eVoLuTiVeMEDIA/master

Event conflicts prevention (for fixed shortcuts including temporary tools)