Added token check to global controller
Merge branch 'master' of github.com:jaeros/firearm_listing