pinax app handles fixtures now
Merge branch 'master' into hotfix-fixtures