*changes in fixtures and schema
Merge remote-tracking branch 'origin/master'