fixed fixture
fixed another fixture
Merge branch 'develop'
updated fixtures
removed tabs in users.yml
changed rank names
another fixture update