ticket:41 Style fixes
ticket:41 small fixes
ticket:41 Merge branch 'master' into production
ticket:00 Fixed fixture
ticket:00 Merge branch 'production'