token and menu(activity)
Merge branch 'dev' of https://github.com/zhiheng3/SpicyPot into dev