Merge branch 'staging'
Merge branch 'master' of github.com:protoswype/shiny_ninja