Fixed stupid error with states (hopefully)
Merge branch 'master' of http://github.com/gtagency/buzzmobile