Close #72
Merge branch 'players-pages' into development
close #75
delete lines
Merge branch 'css-edit' into development
Merge branch 'development'