last updates (token etc)
Merge branch 'master' of https://github.com/sirxbiff/Hearthy