increase timeout for alarm tests
update icon path
Merge remote-tracking branch 'upstream/master'
change token retrieval
Merge pull request #214 from poupotte/master

Change icon path