added beta switch
Merge branch 'master' of https://github.com/phundament/app