fixture change, minor
Merge branch 'base_app' of https://github.com/alanchiao/zbt-rush-app into base_app