Adds token to transactions
Merge branch 'develop' of github.com:ianyang/bundle into develop