fixtures modified
Merge branch 'develop' of github.com:dynamicguy/rails4-bp into develop