fixed fixtures
Merge branch 'master' into mariko
change create user