fixed fixtures for new model
fixed conflicts
Merge branch 'master' into mariko
created sidebar