Merge pull request #46 from where2night/Adrian

Adrian
Merge pull request #47 from where2night/Adrian

fixed bugs events
Token and TokenMobile
update