upd token

upd token
Merge branch '20130903-2'